IThundxr
ba281c789b
chore: remove cherry compat recipes ( #5940 )
2024-08-07 17:27:08 +02:00
simibubi
3a3ded66d9
Merge pull request #6389 from HateMeLikeAPro/item-group-attribute-filter
...
Added InItemGroup attribute filter
2024-08-07 17:26:05 +02:00
simibubi
90da3378bb
Update sign processor
2024-08-07 17:20:58 +02:00
simibubi
44a2181bb1
E A Ports. It's in the blame
...
- Port new changes to 1.20.1
2024-08-07 16:42:42 +02:00
simibubi
49030ec91f
Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev
2024-08-07 15:39:06 +02:00
simibubi
42b57bdd61
Update framed blocks integration
2024-08-07 10:39:18 +02:00
simibubi
c373de47b1
WiiPorts
...
- Port new changes to 1.19
2024-08-07 09:33:36 +02:00
simibubi
a012194f0f
Merge branch 'mc1.18/dev' into mc1.19/dev
2024-08-07 09:07:28 +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
TropheusJ
e227f50470
Redo issue templates ( #5669 )
...
* new issue templates
* add MC version to crash
* make MC version required
* update suggestions
* questions link
* simpler language
* remove minecraft version labeler
* change some more words
* recommend joining discord before reporting a bug
* make debug info optional
* typo, say to not upload log contents. remove minecraft version from crash
* Tweak some descriptions
---------
Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
2024-08-06 11:39:14 -07: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
b625276eac
Merge pull request #5871 from Blazified/mc1.20.1/dev
...
Fixed Potato Cannon Shooter Credit
2024-07-25 20:25:30 +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
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
