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
ad69b9f09d
Merge pull request #6110 from jodlodi/mc1.20.1/dev
...
Implemented roots block tag for tree cutting
2024-07-25 17:39:53 +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
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
