simibubi
0f3c2a6167
Merge pull request #6352 from starlottemusic/mc1.18/dev
...
Minor ClipboardCloneable outline renderer oversight
2024-07-18 11:36:18 +02:00
simibubi
7888c14082
Merge pull request #6356 from IThundxr/mc1.18/big-outlines-fix
...
Fix IHaveBigOutline not working in the y axis
2024-07-18 11:18:46 +02:00
simibubi
649a5936ec
Merge pull request #6385 from Attack8/mc1.18/ManualOnly
...
Respect Manual Only Recipes
2024-07-18 11:12:04 +02:00
Qther
1038b76d38
Performance improvements in several tick methods ( #6697 )
...
* Performance improvements in several tick methods
Avoid capturing lambdas, streams, and Set#removeAll
* Update ServerSchematicLoader to not modify activeUploads while iterating in tick
* Replace iterator with enhanced for loop
2024-07-18 10:24:50 +02:00
simibubi
1b34e52363
Merge pull request #6386 from Attack8/mc1.18/PonderRebind
...
Allow Ponder to be re-bound
2024-07-17 13:11:45 +02:00
simibubi
f09931c1a9
Merge pull request #6406 from VoidLeech/mc1.18/fix-filter-ignoring-respect-data
...
Fix Filters not Respecting 'Respect Data' option
2024-07-17 12:51:04 +02:00
simibubi
f964e892de
Less drains More II
...
- Fixed Potion buckets from Tinkers Construct not interacting correctly with drains and spouts #6316 #4124 #6415
2024-07-17 12:46:20 +02:00
simibubi
ffa26fc0e4
PR Tweaks
2024-07-17 11:43:21 +02:00
simibubi
f9d96b2498
Merge pull request #6424 from VoidLeech/mc1.18/fix-invalid-deploying-recipe-error-msg
...
Fix Deployer Recipe Error Messages
2024-07-17 11:30:34 +02:00
simibubi
70a3cc9df2
Merge pull request #6427 from IThundxr/mc1.20.1/fix-creativetabs-concurrency
...
Fix concurrency issue in Creative Tabs System
2024-07-17 11:24:28 +02:00
simibubi
c3cf3b56e9
Merge pull request #6446 from IThundxr/mc1.18/fix-contraption-step-sounds
...
Fix contraption step sounds
2024-07-17 11:22:33 +02:00
22858
d941863803
Add wood cutting recipes for Regions Unexplored ( #6457 )
...
* Regions Unexplored recipes
* silver birch recipes
* move silver birch recipes to CuttingRecipeGen
2024-07-17 11:11:02 +02:00
simibubi
e8676cec09
Merge pull request #6458 from IThundxr/mc1.20.1/honey-chocolate-fix
...
Fix Honey Buckets & Chocolate Buckets not showing up in creative tabs
2024-07-17 11:08:27 +02:00
simibubi
50db9bc826
Merge pull request #6460 from IThundxr/mc1.18/controller-lectern-fix
...
Fix NPE caused by empty lectern controller in a debug world
2024-07-17 11:06:40 +02:00
simibubi
271ddab7e9
Merge pull request #6461 from IThundxr/mc1.18/wheels-from-below
...
Fix Large Water Wheel Structural blocks catching on fire
2024-07-17 11:06:00 +02:00
simibubi
856c1644a1
Merge pull request #6464 from Attack8/mc1.18/othernetherite
...
Allow any fire resistant armor to be used in lava diving
2024-07-17 11:03:15 +02:00
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
simibubi
2446f8d195
Merge pull request #6542 from HDR/mc1.20.1/dev
...
Fix #6245 : Display links not writing to signs
2024-07-16 11:59:18 +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
IThundxr
4486b16917
fix schematic visual not disappearing after item dropped or unfocused in hotbar
2024-07-08 18:37:14 -04: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
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
HDR
f49bb7822b
Fix displayLink not being able to write to signs
2024-05-30 10:22:48 +02: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
4e51df3f81
Guard against chunk protections
2024-05-09 16:21:11 -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
bd96592339
Honey & Chocolate, the perfect combo
...
Fix Honey buckets and Chocolate buckets not showing up in creative tabs
Port of this commit: 446f693ca7
2024-05-06 17:40:21 -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
IThundxr
600fdb674e
switch back to IHM
2024-05-01 09:11:07 -04:00
IThundxr
4f4b21c0a5
modify fix
2024-04-29 15:18:13 -04:00
IThundxr
ded18c4ee6
Fix concurrency issue in IdentityHashMap
2024-04-29 12:15:30 -04:00
VoidLeech
ab4c29bc40
Switch conditions in getRequiredHeldItem and getProcessedItem
2024-04-29 16:27:57 +02:00
attackeight
60c001696a
Add Ex Nihilo: Sequentia compat
2024-04-26 16:55:33 -04:00
VoidLeech
12bf210f55
Fix filters ignoring 'respect data' option
2024-04-24 16:25:36 +02:00
HateMe
64a36fd2ae
Added InItemGroup
...
Added the InItemGroup attribute filter back.
2024-04-19 17:26:54 +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
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
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
KdotJPG
c92bbdda2d
Increase layered ore shape variation ( #6158 )
2024-03-21 12:01:31 +01:00
attack8
a15d7c5569
More Mod Compat 1
...
- Add Galosphere stone recipes like the Create stones
- Add Elementary Ores compat
- Add Infernal Expansion path pressing recipes
2024-03-19 20:13:45 -04:00
Jensen
9072693c0e
Versioned Inventories for funnel input
...
(cherry picked from commit c8357b2d6ee6215d5d35ec74dd20f71b829c1811)
2024-03-19 05:30:15 +00:00
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
