Commit graph

3675 commits

Author SHA1 Message Date
simibubi
80b3ac89d0 Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev 2024-07-16 19:16:01 +02:00
simibubi
c05e366dc7 Refactor IWrenchable.onSneakWrenched 2024-07-16 19:15:45 +02:00
simibubi
f67341df7e Merge branch 'pr/6467' into mc1.18/dev 2024-07-16 19:03:15 +02:00
simibubi
8de19dbe02
Merge pull request #6468 from Attack8/mc1.18/ore-fixes
Fix Ore Crushing Inconsistency and add Gilded Blackstone Crushing
2024-07-16 18:55:36 +02:00
simibubi
661e5c5aef Baiting the hotfix
- Fixed basin inventory pretending to accept full stacks when empty #3104
- Fixed basin spout outputs getting voided when targeting another basin #6451 #6474
- Fixed basin spout outputs not working when targeting a basin with a recipe filter
2024-07-16 17:43:48 +02:00
simibubi
f29d26705c
Merge pull request #6482 from Attack8/mc1.18/gates-on-trains
Fence Gates on Trains
2024-07-16 16:24:40 +02:00
simibubi
00e919b6c7 Unusual Crafting
- Fixed crash with JEI when a modded crafting recipe has an inconsistent ingredient list #6368 #6494
2024-07-16 16:15:36 +02:00
simibubi
127724b23f Update BlockStressDefaults to use thread-safe maps
#6579 by ByThePowerOfScience
2024-07-16 13:25:04 +02:00
simibubi
08b5515068 Less drains More
- Partially filled water cauldrons can no longer be drained by fluid pipes #6506 #6505
- Fixed forge capabilities on modded cauldron blocks getting ignored (?)
2024-07-16 12:37:02 +02:00
attackeight
a5dc53ba5f
Goggle Tooltip code cleanup and ModernUI compat (#6477)
* Goggle Tooltip code cleanup and ModernUI compat
fixes Creators-of-Create#6404

* Calculate indents based on font
thanks @Tidy-Bear

* exactPositioning workaround

---------

Co-authored-by: zelophed <github@zelophed.me>
2024-07-15 17:14:56 +02:00
simibubi
3c9c668b56
Merge pull request #6592 from Layers-of-Railways/mc1.18/stabilized_contraption_fixes
Fix Stabilized contraption offset and incorrect rotation
2024-07-15 17:01:45 +02:00
simibubi
4b0c852e16
Merge pull request #6595 from IThundxr/mc1.18/less-glue-ticking
Remove unnecessary glue ticking
2024-07-15 16:53:50 +02:00
simibubi
9703417f1c Funnels in motion revisited
- Fixed andesite funnels dropping full stacks when used in a moving contraption (PR #6602 by cshcrafter)
2024-07-15 16:50:17 +02:00
simibubi
9beda447ef
Merge pull request #6659 from VoidLeech/mc1.18/correct-alexmobs-recipe-name
Fix Alexmobs Lava Bottle Filling Recipe Name
2024-07-15 16:21:04 +02:00
simibubi
15f426d9c6 Tag me back
- Backtanks now keep track of item capability data in their placed block #6186
- Backtanks no longer ask for an unobtainable item when placed with a Schematicannon
2024-07-15 16:17:28 +02:00
littlej541
54f760feb1
Goggles function in any curio slot (#6520) 2024-07-15 15:14:48 +02:00
IThundxr
1722d4dda0
Total Ram info inside DebugInfo command (#6507)
* add total ram available info to DebugInfo command

* remove unused import
2024-07-15 15:07:52 +02:00
zelophed
398eb64880 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev 2024-07-15 14:45:36 +02:00
zelophed
d9198f678e rework ThresholdSwitch compat
- adds better support for SophisticatedStorage and FunctionalStorage
2024-07-15 14:45:23 +02:00
simibubi
cbfbfb9e74
Merge pull request #6662 from VoidLeech/mc1.18/backtank-preserves-nbt
Make Backtank preserve NBT on placement.
2024-07-15 14:11:10 +02:00
simibubi
3f6efe5520
Merge pull request #6664 from NotSoEpic/mc1.18/dev
Encasing blocks plays a placing sound
2024-07-15 13:46:52 +02:00
simibubi
4953dbb181 Merge branch 'pr/6677' into mc1.18/dev 2024-07-15 13:36:30 +02:00
simibubi
4f6ab55858
Merge pull request #6674 from drouarb/mc1.18/dev
- Optimised item rendering on belts and depots
2024-07-15 13:11:03 +02:00
simibubi
4b3dcc32ab Equals does not equal not equals
- Fix inverted fluid comparison from a recent PR
2024-07-15 12:58:38 +02:00
simibubi
7bd602a33f The Dupe Chute
- Fixed a duplication bug involving belts and chutes #6210 #5781 #6686
2024-07-15 11:44:30 +02:00
drouarb
03973c4dc5 Culling item on belts 2024-07-11 00:00:27 +02:00
drouarb
9dfbe061de Preserving BakedModel and switching to ItemRenderer.render instead of ItemRenderer.renderStatic for performance 2024-07-09 20:44:10 +02:00
NotSoEpic
ee41e0f04e Encasing blocks plays a placing sound 2024-07-06 08:41:41 +08:00
VoidLeech
caf79d40ae
Revert "Preserve getOrCreateStack"
This reverts commit a6f5c51d6a.

Would duplicate the enchants on the backtank
2024-07-05 02:29:33 +02:00
VoidLeech
a6f5c51d6a
Preserve getOrCreateStack 2024-07-05 01:08:44 +02:00
VoidLeech
d67f345146
remove unused imports 2024-07-05 00:57:11 +02:00
VoidLeech
f20dbd5cae
fix backtank nbt not saving
ForgeCaps don't save yet either though
2024-07-05 00:16:28 +02:00
VoidLeech
153423cc37
fix alexmobs compat recipe name 2024-07-04 01:30:34 +02:00
attackeight
67f77cf0b5 Change from item to tag for sturdy sheet production
(closes Creators-of-Create#6655)
2024-07-03 19:20:42 -04:00
TelepathicGrunt
75d337ba8c
Use safer fluidstack comparisons in FluidIngredient (#6317)
* Use safer fluidstack comparisons

* switched to getFluid check
2024-06-23 15:46:36 +02:00
IThundxr
d8eeaf1220
remove unnecessary glue ticking 2024-06-14 15:52:54 -04:00
techno-sam
f9c966d6a8
I'm totally stable
fixes Creators-of-Create/Create#3640 and Creators-of-Create/Create#6590
2024-06-12 15:49:08 -07:00
attackeight
7e512a37c7 Move curios tag and upgrade aquatic tree fertilizer recipes to datagen 2024-06-01 07:54:57 -04:00
attackeight
5ad844daf9 Fence Gates on Trains
fixes Creators-of-Create#6354
2024-05-12 08:17:53 -04:00
attackeight
cda65027b2 Fix Ore Crushing Inconsistency and add Gilded Blackstone Crushing
fixes Creators-of-Create#6440
2024-05-09 16:53:24 -04:00
attackeight
d8f989a370 Merge remote-tracking branch 'origin/mc1.18/wrenchprotectionrespection' into mc1.18/wrenchprotectionrespection
# Conflicts:
#	src/main/java/com/simibubi/create/content/equipment/wrench/IWrenchable.java
2024-05-09 16:21:21 -04:00
attackeight
4e51df3f81 Guard against chunk protections 2024-05-09 16:21:11 -04:00
attackeight
e9a17eb2f8 Guard against chunk protections 2024-05-07 20:25:30 -04:00
attackeight
6b8794b4f3 Change logic to make more sense 2024-05-07 07:01:23 -04:00
attackeight
f5c82022ce Any Armor Repaired by a type of netherite is netherite now
fixes Creators-Of-Create#6422
2024-05-06 23:31:26 -04:00
IThundxr
229b9a88e8
Fix #6240 2024-05-06 17:59:24 -04:00
IThundxr
f899bfe0ab
Fix #6205 2024-05-06 17:58:27 -04:00
IThundxr
62a16a4070
prefix method 2024-05-02 20:06:16 -04:00
IThundxr
0414692d82
redo injector, shouldn't break between versions now 2024-05-02 20:02:29 -04:00
VoidLeech
ab4c29bc40
Switch conditions in getRequiredHeldItem and getProcessedItem 2024-04-29 16:27:57 +02:00