simibubi
d80fc93b94
Merge pull request #6789 from Attack8/mc1.18/mmc-3
...
Add Environmental wood support
2024-08-07 18:04:42 +02:00
attackeight
ec52c0aa2f
More Mod Compat 3
...
Add Environmental wood support
2024-08-07 11:28:30 -04:00
zelophed
c026d51cb4
Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev
2024-08-07 17:24:32 +02:00
zelophed
64ee9057bd
fix goggle overlay formatting
2024-08-07 17:24:24 +02:00
simibubi
a37acd5b18
5.1G Standards
2024-08-07 08:28:08 +02:00
attackeight
46c7f78eb9
More Mod Compat 2 ( #6783 )
...
* Add compatibility recipes for The Aether, Haunted Harvest, Regions Unexplored and Vampirism
* Add crushing recipes for ambrosium and zanite ore from The Aether
* Move to datagen
* Fix misspelling
---------
Co-authored-by: Mario <mario.mario@y7mail.com>
2024-08-07 08:19:36 +02:00
zelophed
8c696b5f8a
Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev
2024-08-06 20:08:11 +02:00
zelophed
1232a08fde
vault shuffle
...
- Multiblocks (i.e. vaults and tanks) will now try to remain in the same grouping after being assembled and disassembled by a contraption
2024-08-06 20:07:40 +02:00
simibubi
c66827c43e
The Frame Train
...
- Fixed modded signs getting wiped when moved by contraption or printed in a schematic
- Added schematic compatibility for the mod "framed blocks"
2024-08-06 18:50:20 +02:00
simibubi
4d04a16fbb
Smart but stubborn
...
- Fixed powered smart chutes scanning inventories for extractable items / updating their version tracker #6154 #5867 #6770
2024-08-06 16:42:22 +02:00
simibubi
c69716bf7e
Merge pull request #6779 from ryanhaney97/fix-rollers-replacing-portals
...
Fix for #6758 : Added check for portal blocks when trying to fill.
2024-08-06 14:19:43 +02:00
simibubi
80f2836b40
Merge pull request #6769 from Attack8/mc1.18/pause-display-links
...
Add check for Display Link power before gathering data
2024-08-06 14:00:50 +02:00
simibubi
8b782019e0
You spin me right round
...
- Seated Players now sync their camera rotation to the movement of the contraption (if possible)
2024-08-06 13:42:36 +02:00
yoshiquest
803bf45250
Added check for portal blocks when trying to fill.
2024-08-05 14:31:56 -05:00
simibubi
2e91e16932
For your eyes only
...
- Fixed Schematic position editor opening both on player and host player instance during LAN games #5935 #5969
2024-08-05 14:13:47 +02:00
attackeight
a8cf3e29a4
Fix notifyGatherers not referencing a method with appropriate checks in place
2024-08-03 16:11:54 -04:00
simibubi
e52b59097e
Merge pull request #5866 from VoidLeech/mc1.18/fix-uncraftable-modded-potion-fluids
...
Fix Automated Brewing of Modded Potions
2024-07-25 20:28:34 +02:00
simibubi
67db1e50f1
Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev
2024-07-25 19:55:46 +02:00
simibubi
f6a4851140
Derployer
...
- Revert #5266 in favour of fixing #5674 , (#6048 )
2024-07-25 19:55:34 +02:00
simibubi
4b02decb4f
Merge pull request #6062 from IThundxr/mc1.18/fixDropperDupe
...
Fix #4880 Dropper Dupe
2024-07-25 19:40:34 +02:00
simibubi
c013173265
Fix CC:Tweaked setSchedule entries order
...
- Port of #5973 to 1.18
2024-07-25 19:21:58 +02:00
simibubi
f8cc7ab73c
Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev
2024-07-25 18:47:15 +02:00
simibubi
4ce2971979
I'm not like other IDs
...
- Added support for TFC wood types on water wheels #6092
2024-07-25 18:47:04 +02:00
simibubi
7582646e37
Merge pull request #6065 from cakeGit/patch-1
...
Added missing whitespace to TranslatingContraption.java
2024-07-25 18:36:42 +02:00
simibubi
5fc2153d52
Merge pull request #6088 from cakeGit/patch-2
...
Added station blockstate check
2024-07-25 18:36:00 +02:00
simibubi
fc21d3abf6
Subcontraptions for some people #6119
2024-07-25 17:26:19 +02:00
simibubi
57a7b66553
Merge pull request #6145 from drwoops/bug-5921
...
restore the invariant that draining is the inverse of filling (bug #5921 )
2024-07-25 17:06:29 +02:00
simibubi
8add39d24d
Basin checks use blockentity instanceof
...
- Implements #6172
2024-07-25 16:56:35 +02:00
simibubi
625a1f38e6
Cannon Arithmetic
...
- Schematicannons no longer consume additional gunpowder items until the previous item is depleted
- Condensed Schematicannon fuel config to a single shots-per-gunpowder value
- Schematicannons can now take gunpowder from adjacent inventories if necessary
- Fixed a typo in ponder
2024-07-25 16:14:45 +02:00
simibubi
dd7eedd1f0
Extra bracket validation #6271
2024-07-25 15:15:25 +02:00
simibubi
f6dfe7d688
Merge pull request #6281 from Attack8/mc1.18/snowtoice
...
Add Ice Compacting Recipe and runData
2024-07-25 15:10:05 +02:00
simibubi
f8e8c476ad
Merge pull request #6285 from JensenJ-Modding/mc1.18/dev
...
Versioned Inventories for funnel input
2024-07-25 13:27:26 +02:00
simibubi
d84a7faa6a
Merge branch 'pr/6288' into mc1.18/dev
2024-07-25 13:16:38 +02:00
IThundxr
96a05e70dd
Null protection & Readability changes ( #6325 )
...
* Error Null cannot be Null
- Add more TrackEdge null protection
- Replace 2 for loops with enhanced for loops to improve readability
- Remove some unneeded unboxing
- Cleanup some interfaces
- Remove private from enum constructor, it's already private
- set enum value as final
- remove static from inner interfaces & enums
* Revert new Random()
* unused import
2024-07-25 12:36:36 +02:00
IThundxr
2c98728b20
General code cleanup and small fixes ( #6343 )
...
* redo switch statement using modern java's arrow case
* fix: Add moss carpet to brittle tag
fixes #6342
* update tags
* run datagen
* formatting
* fix comment
* fix comment
2024-07-25 12:34:02 +02:00
simibubi
3d84836422
Backwards Approach
...
- Fixed trains acceleration edge case at low speed settings #6348
2024-07-25 12:26:23 +02:00
simibubi
067062ca62
Merge pull request #6704 from IThundxr/patch-1
...
Disallow item extraction from crushing wheels with mech arms
2024-07-25 11:03:13 +02:00
simibubi
b90e11c120
Squashed commit of the following:
...
commit e398793b887986e730cf6b3c7a9c96861d186591
Author: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Thu Jul 25 11:00:21 2024 +0200
Remove duplicate line in buildscript
commit e6a1ebd40332ba649fab968841d7b88cdec51553
Merge: acbe5102c 2839987114d2c35b111038b76d34d2c35b11b
2024-07-25 11:00:57 +02:00
simibubi
283998711d
Fix CME in minecart capability
2024-07-24 14:24:59 +02:00
simibubi
eaa4688a3f
Fix normals on Flywheel model
2024-07-24 14:24:44 +02:00
simibubi
982fd502e8
Fix normals on Crushing Wheel model
2024-07-21 15:18:15 +02:00
IThundxr
b6136dd215
disallow item extraction from crushing wheels with mech arms
2024-07-18 09:17:28 -04:00
simibubi
e32239299a
Tidy up #6385
2024-07-18 13:11:17 +02:00
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
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
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
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
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
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
