Commit graph

3757 commits

Author SHA1 Message Date
simibubi
9ecfe6bd6f Merge branch 'mc1.18/dev' into mc1.19/dev 2024-09-03 00:00:51 +02:00
simibubi
1c12c47dd9
Merge pull request #6879 from Creators-of-Create/l10n_crowdin_translations
New Crowdin translations
2024-09-02 23:57:33 +02:00
simibubi
d4a854fb6e Disaster Depot
- Fixed bugs introduced by fa5b71b7eb
2024-09-02 23:55:51 +02:00
zelophed
2b480f7d5a fix create.ponder.redstone_link.text_4 2024-09-02 23:45:23 +02:00
Crowdin Bot
18d7a70862 New Crowdin translations by Github Action 2024-09-02 21:21:17 +00:00
simibubi
0a7070ec49 Datagen 2024-09-02 22:36:51 +02:00
simibubi
3fddf2f99a Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-09-02 22:30:45 +02:00
simibubi
a01e959dbd Datagen 2024-09-02 22:08:19 +02:00
simibubi
b1ceb102f8 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-09-02 22:00:32 +02:00
simibubi
9ce6f6f73f Fly++ 2024-09-02 21:44:24 +02:00
simibubi
fa5b71b7eb It takes a special kind of player
- Fixed Depot accepting item stacks with invalid amounts
- Fixed filter slots containing enchantment and attribute data of filter items
2024-09-02 21:20:17 +02:00
PepperCode1
c267a413d9 Fix #5367 2024-09-02 08:40:30 -07:00
PepperCode1
bbb9ac8c43 Use more Forge tags in recipes
- Fix #3959
- Fix #4648
2024-09-01 20:52:08 -07:00
PepperCode1
a06b9c11eb Fix #5703 2024-09-01 17:08:13 -07:00
PepperCode1
e6f969af15 Do not allow glass panes to be put into copycat panels 2024-09-01 15:36:28 -07:00
PepperCode1
849824189f Fix trapdoor, panel, bar, and pane item models
- Fix #5349
2024-09-01 14:54:09 -07:00
PepperCode1
088cc1a336 Prevent entries added through CopperRegistries from crashing the game
Most reported issues of this happening are actually caused by a
different issue during registration that is suppressed due to the crash.
Now that the crash can't happen, the underlying exception will be
properly reported. This change also allows using Create with the
Compressed mod, but if Compressed loads before Create, Create's
additions to the CopperRegistries will fail to apply.
2024-08-31 12:07:33 -07:00
simibubi
59a3ab244b Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-25 20:29:49 +02:00
simibubi
0f0e00c781 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-25 19:51:28 +02:00
simibubi
e40b844aa1 Ground-breaking Excavation
- Update and scale icons
- Fixed Display Boards updating instantly only at 256rpm Clockwise, not CCW
- Fixed Pulley ropes able to break unbreakable blocks
- Fixed encasing belts not playing a place sound
2024-08-25 12:47:09 +02:00
simibubi
9f6307c355
Merge pull request #6850 from IThundxr/mc1.18/fluid-fix
Extra check to make sure pipes don't place fluids they shouldn't
2024-08-25 11:11:39 +02:00
simibubi
7407887320
Merge pull request #6842 from IThundxr/mc1.18/icon-update
Update intellij icon
2024-08-25 11:09:25 +02:00
simibubi
5ac7e6fe77
Merge pull request #6836 from IThundxr/mc1.18/fix-deployer-blockitem-onuse
Fix deployers not calling BlockItem#onUse
2024-08-25 11:08:05 +02:00
simibubi
8f07663a93
Merge pull request #6822 from zOnlyKroks/bugfix/fix-graphicsmode-debug-information
Fix Graphics Mode Debug Information
2024-08-25 10:48:24 +02:00
simibubi
6d849bbd40
Merge pull request #6813 from cakeGit/patch-4-Ghost-Schematic
Fix to issue #6784, with schematic renderers not deactivating
2024-08-25 10:47:14 +02:00
simibubi
913a78cb0d
Merge pull request #6809 from IThundxr/patch-1
Allow for TrainHatInfoProvider to properly be extended
2024-08-25 10:41:11 +02:00
IThundxr
08f8d3b0f5
extra check to make sure pipes don't place fluids they shouldn't 2024-08-24 10:46:45 -04:00
IThundxr
dfdb197802
Update mod icon aswell 2024-08-22 09:39:58 -04:00
IThundxr
10e533fecc
move accessor to correct folder 2024-08-18 17:49:13 -04:00
IThundxr
b3604306eb
Merge remote-tracking branch 'origin/mc1.18/fix-deployer-blockitem-onuse' into mc1.18/fix-deployer-blockitem-onuse
# Conflicts:
#	src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerHandler.java
2024-08-17 20:39:08 -04:00
IThundxr
d244506656
fix cart assembler 2024-08-17 20:37:06 -04:00
IThundxr
6a13d6a7b1
Fix deployers not calling BlockItem#onUse 2024-08-17 20:31:37 -04:00
Finn Rades
fb14ee0278 Fix Graphics Mode Debug Information 2024-08-14 14:10:21 +02:00
cakeGit
969b226a00 Added render deactivation before initialising the new one
Then, in the event that the schematic isn't deployed, and the renderers don't get reset, the existing structure wont stay
2024-08-12 22:36:33 +01:00
cakeGit
a56a214091 Make track deploying advancement work in schematics 2024-08-12 21:55:59 +01:00
cakeGit
041e06b0b7 Testing implementation 2024-08-12 21:49:31 +01:00
Cake
1d2da07756
Added return after schematic activation to prevent double interaction 2024-08-12 21:29:57 +01:00
simibubi
1e2289ff9d Compat chores
- Remove or tweak erroring recipes accumulated from old PRs
2024-08-11 21:59:03 +02:00
IThundxr
b9d3cdc857
Allow for TrainHatInfoProvider to properly be extended 2024-08-11 12:05:51 -04:00
simibubi
af54e8ecf3 Fix-ups from testing III
- Fixed hidden and invalid items being added to creative mode search tab
- Fixed In-ItemGroup item attribute not working properly
2024-08-11 16:54:51 +02:00
simibubi
e1fb487854 Fix-ups from testing II
- Fixed powered display link not lighting up its indicator
2024-08-11 12:31:51 +02:00
simibubi
a92c08b1e1 Fix-ups from testing I
- Fixed central block of waterwheels still able to catch fire
- Fixed vertical belts accepting items
2024-08-11 12:20:16 +02:00
simibubi
879220efb4 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-11 10:09:46 +02:00
simibubi
6f120fc862 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-11 10:09:07 +02:00
simibubi
0983dc05cd Amend to previous commit 2024-08-10 19:28:36 +02:00
simibubi
d8cd79852b See you later elevator
- Fixed elevator contraptions moving to y=0 when loading in #4830
2024-08-10 19:26:14 +02:00
simibubi
87c334e456 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-10 16:26:17 +02:00
simibubi
a486b3e937 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-10 16:21:36 +02:00
simibubi
842e1bb3af
Merge pull request #6803 from Creators-of-Create/l10n_crowdin_translations
New Crowdin translations
2024-08-10 15:04:25 +02:00
IThundxr
b4da24641c
Fix schematic renderers not correctly being invalidated on resource reloads (#6801)
* Fix #6726

* move renderer ticking call to be earlier
2024-08-10 15:03:43 +02:00
Crowdin Bot
56ad4ba1ee New Crowdin translations by Github Action 2024-08-10 12:37:36 +00:00
simibubi
b8a329d021
Merge pull request #6796 from IThundxr/mc1.20.1/override-fix
Fix potential issue caused by soft override
2024-08-09 09:55:54 +02:00
IThundxr
9ffa14786e
get rid of the soft override 2024-08-08 22:00:53 -04:00
simibubi
519ff1c8da Datagen 2024-08-08 08:39:46 +02:00
simibubi
5a11166cf4 Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev 2024-08-08 08:30:24 +02:00
simibubi
24cc53c973 Datagen 2024-08-08 08:26:13 +02:00
simibubi
3025941258 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-08 08:24:08 +02:00
simibubi
1ad5a97ca1 Fixed Tiled Glass not requiring Silk Touch 2024-08-08 08:23:08 +02:00
simibubi
3747f4dd81
Merge pull request #6793 from Attack8/mc1.18/ua-typo
Fix small typo with upgrade aquatic stripped driftwood
2024-08-08 08:10:47 +02:00
attackeight
b8a2834de0 Merge mc1.19/dev into mc1.19/mmc-4 2024-08-07 15:08:02 -04:00
simibubi
b7241e14af Datagen 2024-08-07 20:24:26 +02:00
simibubi
f215324545 Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-07 20:20:21 +02:00
simibubi
9d1e4883bc Merge branch 'mc1.18/dev' into mc1.19/dev 2024-08-07 20:17:32 +02:00
attackeight
9b11fc200c Fix small type with upgrade aquatic stripped driftwood 2024-08-07 13:56:39 -04:00
attackeight
6fe9a036f6 More Mod Compat 4
Update compat mods to 1.19
Add windswept support
Add Good Ending Support
Update Forbidden Arcanus support
Add Quark ancient wood
2024-08-07 13:51:12 -04:00
simibubi
bb43aaa28b Sorting it out
- Implement #5844 (sorted inventory order on contraptions)
2024-08-07 18:33:09 +02:00
simibubi
d80fc93b94
Merge pull request #6789 from Attack8/mc1.18/mmc-3
Add Environmental wood support
2024-08-07 18:04:42 +02:00
simibubi
af48ab2dc9 Tweak a couple of offsets 2024-08-07 18:02:05 +02:00
simibubi
c06db3040f Merge branch 'mc1.20.1/dev' into pr/6194 2024-08-07 17:37:56 +02:00
attackeight
ec52c0aa2f More Mod Compat 3
Add Environmental wood support
2024-08-07 11:28:30 -04:00
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
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
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
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
Jozufozu
eae8cd467b Cranking out fixes
- Fix hand crank not deleting its rotatingModel
- Fix exception setting up pulley lightcache
- Bump flywheel build to fix garbage models
2024-07-27 18:30:40 -07:00
Jozufozu
5be92fcde8 Bumpy road
- Bump flywheel build
- Directly rotate the last pose and normal matrix in SBB
2024-07-27 17:43:24 -07: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