Commit Graph

3763 Commits

Author SHA1 Message Date
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
attackeight
eadb3608d8 Merge remote-tracking branch 'origin/mc1.18/mmc-1' into mc1.18/mmc-1
# Conflicts:
#	build.gradle
2024-04-26 16:56:05 -04:00
attackeight
60c001696a Add Ex Nihilo: Sequentia compat 2024-04-26 16:55:33 -04:00
attackeight
776c41ca84 Add Ex Nihilo: Sequentia compat 2024-04-26 16:54:59 -04:00
VoidLeech
12bf210f55
Fix filters ignoring 'respect data' option 2024-04-24 16:25:36 +02:00
attackeight
971fae9c0e Allow Ponder to be re-bound 2024-04-17 21:22:16 -04:00
attackeight
5b1b8f22b0 Respect Manual Only Recipes
The following recipes will now respect the "_manual_only" recipe suffix
 - Sandpaper Polishing (Deploying)
 - Item Application (Deploying)
 - Smelting (Fan Blasting)
 - Smoking (Fan Smoking)
 - Blasting (Fan Blasting)
fixes Creators-Of-Create#5164
2024-04-17 19:15:47 -04:00
attackeight
53a483dde2 Accidentally forgot to comment these out 2024-04-16 21:04:01 -04:00
attackeight
79aea176f3 Ice and Fire Dragons Compat
- Silver Ingots
2024-04-15 22:15:31 -04:00
attackeight
dcfcf9e896 Merge remote-tracking branch 'origin/mc1.18/snowtoice' into mc1.18/snowtoice
# Conflicts:
#	src/generated/resources/.cache/cache
#	src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
2024-04-15 21:10:34 -04:00
attack8
4201a184a9 Add Ice Compacting Recipe and runData 2024-04-15 21:09:27 -04:00
attackeight
5277d5971d
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/mmc-1 2024-04-15 20:41:14 -04:00
IThundxr
b7bc7bc757
Allow big outlines in y axis 2024-04-06 19:39:41 -04:00
Star
d00517282a Minor ClipboardCloneable outline renderer oversight 2024-04-04 22:25:20 -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