Commit graph

3813 commits

Author SHA1 Message Date
attack8
612f9f5efa Add Ice Compacting Recipe and runData 2024-03-18 16:16:08 -04:00
attackeight
f551107e6d
Move compat recipies to datagen (#5095)
* Separate config options for placing source blocks
placeFluidSourceBlocks ->
     fluidFillingPlaceFluidSourceBlocks
     pipesPlaceFluidSourceBlocks

* Add IC2 Metals compat

* Compat Datagen, pt 1

* Add IC2 Metals compat

* Compat Datagen, pt 1

* All Compat Recipes moved to datagen

* Add Oreganized and Galosphere compat

* Update HexCasting Compat

* Add The Vault Compat

* Add The Vault Compat

* Fix dupe bug added by last commit

* adding some wood missed previously

* add Nether's Exoticism Compat

* Update Mods.java

Remove duplicate enum entry

* Update CuttingRecipeGen.java

Reflect Mods.java update

* Update MillingRecipeGen.java

Reflect Mods.java changes

* Update PressingRecipeGen.java

Reflect Mods.java changes

* Update WashingRecipeGen.java

Reflect Mods.java changes

* Ok it's actually correct now

---------

Co-authored-by: NerdsOfAFeather <ftcteam18218@gmail.com>
2024-03-17 00:40:05 +01:00
zelophed
92975231d7 fix sugarcane acting as logs with mechanical saws
- prevent trees adjacent to sugar cane or similar blocks from being cut by the mechanical saw unintentionally
2024-03-17 00:22:01 +01:00
IThundxr
c4098b31b2
feat: Allow changing the goggle overlay tooltip icon (#5900)
* feat: allow changing the goggle overlay tooltip icon

* change method name
2024-03-16 19:31:05 +01:00
IThundxr
8ffc4ef96a
Fix deployer anti agro not working, and switch away from deprecated event (#6072)
* Fix agro, switch to non deprecated event as well

* spaces -> tabs
2024-03-16 19:18:07 +01:00
attackeight
866b619767
Add Unique Vertical Gearbox Crafting Recipe (#6171) 2024-03-16 19:13:55 +01:00
IThundxr
d9d4967100
Big Outlines API (#6187)
* Big Outlines API

* some more javadoc

* Has -> Have
2024-03-16 19:07:14 +01:00
IThundxr
298d1c1814
Fix #5998, Configs with the same key 2024-03-16 19:04:25 +01:00
IThundxr
2a5935db61
Make roller account for custom tracks 2024-03-16 18:56:18 +01:00
zelophed
04d1a53846 Support custom tooltip component heights in goggle overlay 2024-03-16 17:48:34 +01:00
IThundxr
5df8ed963e
small change: add Create's icon to .idea for intellij users (#5941) 2024-03-16 17:39:39 +01:00
Starlotte
b25b88c772
Add & implement spout & clipboard sfx (#5916)
* Add & implement spout sfx

* Add Clipboard Sounds

* Implement Clipboard Sounds

* Fix formatting for new sounds

---------

Co-authored-by: Starlotte <65743811+Starlotte@users.noreply.github.com>
2024-03-16 17:38:04 +01:00
cakeGit
3eece900aa
Merge branch 'Creators-of-Create:mc1.18/dev' into patch-2 2024-03-16 16:37:37 +00:00
IThundxr
5adb835502
Fix chromatic compound not working under y0 (#6227)
* Fix chromatic compound not working under y 0

* Switch away from constant
2024-03-16 09:27:18 -07:00
Max Mielke
bb7e835a8d
Merge pull request #5826 from IThundxr/mc1.18/fixSignalNPE
fix: Signal Group NPE
2024-03-16 17:20:44 +01:00
Max Mielke
cbaab918ae
Merge pull request #5772 from IThundxr/mc1.18/track-advancement-fix
feat: Make "A New Gauge" Advancement check for AllItemTags#TRACKS
2024-03-16 17:05:50 +01:00
Max Mielke
4294d74144
Merge pull request #5707 from homok43/mc1.18/dev
Memory leak in CapManipulationBehaviourBase
2024-03-16 16:59:32 +01:00
IThundxr
7800328bbd
remove unused imports 2024-03-05 15:33:45 -05:00
GizmoTheMoonPig
3c9cc6cd1d
oops 2024-02-28 17:24:38 -07:00
GizmoTheMoonPig
7016151ef7
didnt mean to push that 2024-02-28 17:21:32 -07:00
GizmoTheMoonPig
1a4e71cb0d
move conductor hat information to resource packs 2024-02-28 17:20:35 -07:00
jodi / jodlodi
adcfefba37 Forgot about twilight forest's mangrove roots 2024-02-21 17:35:19 +01:00
drwoops
757f4e2699 restore the invariant that draining is the inverse of filling 2024-02-19 10:37:56 +01:00
jodi / jodlodi
b3db759b0c Implemented roots block tag for tree cutting
With added optional tag entries for Twilight Forest's root blocks
2024-02-12 16:57:46 +01:00
cakeGit
378e970005 Added station blockstate check 2024-02-07 20:12:41 +00:00
cakeGit
ffd605f8ac
Added missing whitespace 2024-02-03 12:56:37 +00:00
IThundxr
d62774ff65
Fix #4880 2024-02-02 19:23:36 -05:00
Blazified
d9b40a0397 Fixed Potato Cannon Shooter Credit
Projectile and shooter were the wrong way round in the damage method. This resulted in some enchantments not taking effect, no EXP, and no contribution to killed stats.
2023-12-14 08:48:33 +00:00
VoidLeech
aa479c56fe Make automated brewing of modded potions use the same fluid amount as vanilla recipes 2023-12-12 20:01:47 +01:00
VoidLeech
c707fbd448 Fix modded potion recipes using uncraftable potion in automated brewing 2023-12-12 19:53:57 +01:00
IThundxr
ff4eb581fc
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/fixSignalNPE 2023-11-30 09:24:52 -05:00
IThundxr
fbc62d4ba2
fix: signal group NPE 2023-11-30 09:22:58 -05:00
IThundxr
a6079ff9af
feat: Make "A New Gauge" Advancement check for AllItemTags#TRACKS 2023-11-19 14:44:35 -05:00
homok43
37b58a82f4 Fixed memory leak 2023-11-04 17:12:50 +01:00
simibubi
a41053b896 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2023-11-02 15:35:37 +01:00
simibubi
26fc820c69 Merge branch 'mc1.18/dev' into mc1.19/dev 2023-11-02 15:35:09 +01:00
simibubi
2201d87da7 Asset patches
- Fixed uvs on stress- and speedometers' block models
- Toolbox hotbar slot overlay now uses the revised brass palette from 0.5.1
2023-11-02 15:30:32 +01:00
simibubi
1e666e400d Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2023-11-02 12:20:29 +01:00
simibubi
aef8947e35 Merge branch 'mc1.18/dev' into mc1.19/dev 2023-11-02 11:55:11 +01:00
simibubi
fff2512a67 Bump version 2023-11-02 11:48:09 +01:00
simibubi
8e323d03c9 1.19 datagen 2023-11-02 11:41:34 +01:00
simibubi
6e19661bf9 Port Changes 2023-11-02 11:32:38 +01:00
simibubi
04406690ca Merge branch 'mc1.18/dev' into mc1.19/dev 2023-11-02 11:32:20 +01:00
simibubi
f8ef93fbd9
Merge pull request #5523 from Creators-of-Create/l10n_crowdin_translations
New Crowdin translations
2023-11-02 11:16:28 +01:00
Crowdin Bot
6e5aced6b8 New Crowdin translations by Github Action 2023-11-02 10:00:49 +00:00
simibubi
962f03c1c5 Sisyphus's broken printer
- Fixed Schematics failing to load when containing items with sensitive nbt #5680
- Fixed Turntable handler causing a crash during world shutdown #5696
- Cached outputs of BeltHelper.isItemUpright()
2023-11-02 10:57:00 +01:00
simibubi
eea8bb2607 Filter code caused global warming
- Contents of a filter are no longer deserialised from item nbt each time a stack is tested
- FilteringBehaviour.getFilter() no longer creates a copy of the item
- MovementContext for contraption actors now have a shortcut to a cached filter from their corresponding BlockEntity
2023-11-02 00:08:34 +01:00
simibubi
d6708cef3b Collide on sight
- Trains check their distance before running full collision tests
- Trains can no longer collide when on separate track networks
- Micro-optimised some streams and map value iterators
2023-11-01 20:22:29 +01:00
simibubi
77ba1e8bf6
Merge pull request #5681 from TimovVeen/mc1.18/pathfinding
Train navigation optimization
2023-11-01 14:17:51 +01:00
Timo van Veen
3c3ce93fa1 final cleanup 2023-11-01 13:56:53 +01:00