Commit graph

3847 commits

Author SHA1 Message Date
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
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
IThundxr
653b1e7909
Issue Label Actor (#6221)
* label actor

* Push

* Update bug_report.yml

* update label actor

* fix close issue type

* Update label actions

* Add missing quotes

* Make messages more concise

* Fix typo and improve hybrid server message

---------

Co-authored-by: PepperCode1 <44146161+PepperCode1@users.noreply.github.com>
2024-08-10 12:26:26 -07: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
zelophed
fa4f5243bc update crowdin.yml 2024-08-08 13:24:11 +02: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
c413e08bf4
Merge pull request #6792 from Attack8/mc1.19/mmc-4
More Mod Compat 4 (1.19 update)
2024-08-08 08:15:03 +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
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