JensenJ
66ccb661f4
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev
2024-07-16 20:24:53 +01:00
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
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
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
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
JensenJ
a9ec38d5e5
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev
2024-03-31 20:43:19 +01:00
IThundxr
d66170c8fe
fix: Schematicannon request wrong blocks ( #5830 )
...
* fix: schematics request tall grass block which is unobtainable (#5814 )
* fix: give large ferns the same treatment
* remove unused imports
* comments
* fix requirement for farmers delight rich soil
2024-03-22 14:45:41 +01:00
Jay Turner
efb3cf490d
Add null-safety check on usage of BlockEntity.loadStatic ( #6224 )
2024-03-22 14:38:56 +01:00
attackeight
6802a1316b
Respect 'eternal' modifier from Forbidden and Arcanus in Deployer Recipes ( #6231 )
...
- We Could be Immortal
- Fixes Creators-of-Create#6220
2024-03-22 14:35:10 +01:00
IThundxr
51db53c74f
Fix Copycat step placement helper ( #6267 )
2024-03-22 14:27:35 +01:00
IThundxr
41f957a94d
Fix changing bogey style not updating the block properly ( #6273 )
...
* Fix bogey block's placing the wrong block
* Clean the code up a bit
* Fix bitflag
2024-03-22 14:23:20 +01:00
IThundxr
7d3d4a1e7c
feat: Track Placement breaks flowers ( #5821 )
...
* feat: tracks break flowers during placement
* chore: cleanup import
2024-03-21 12:09:24 +01:00
Jensen
9072693c0e
Versioned Inventories for funnel input
...
(cherry picked from commit c8357b2d6ee6215d5d35ec74dd20f71b829c1811)
2024-03-19 05:30:15 +00:00
