Commit Graph

231 Commits

Author SHA1 Message Date
embeddedt
55201311c7
Load vanilla resources if revert is required 2023-03-19 17:49:31 -04:00
embeddedt
bc1c70bd0c
Remove (usually) redundant datapack reload on world creation screen
The second, Forge-added reload is enough in all cases except when
mods supply invalid datapacks.

In this edge case, we will need to reload server resources when the
user requests to revert to vanilla
2023-03-19 17:49:31 -04:00
embeddedt
214015dfe9 Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-15 15:00:50 -04:00
embeddedt
36a7b93d80 Fix ImmPortals crash 2023-03-15 15:00:14 -04:00
embeddedt
fb6167ec6d
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-13 14:40:26 -04:00
embeddedt
8d9ae53e0e Merge remote-tracking branch 'origin/main' into 1.18 2023-03-13 14:40:03 -04:00
embeddedt
38a4776626 Fix rare structure manager crash 2023-03-13 14:39:43 -04:00
embeddedt
f30b1b70f6
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-11 20:49:13 -05:00
embeddedt
8457cc5eff
Avoid crashing if REI creative search fails 2023-03-11 20:48:59 -05:00
embeddedt
c9a48eb832
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-11 20:17:44 -05:00
embeddedt
a9605a6888
Make REI search tree higher priority than JEI one
Fixes issues with REI compat plugin
2023-03-11 20:12:01 -05:00
embeddedt
42fe91ad91
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-11 11:51:31 -05:00
embeddedt
4d8537ee4f
Tweak event used to detect main menu appearing, should fix game load not being measured 2023-03-11 11:50:32 -05:00
embeddedt
cf9fa6e055
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-11 11:29:52 -05:00
embeddedt
9eabaac35a
Add system to retry larger atlas sizes 2023-03-11 11:29:30 -05:00
embeddedt
3ba5b4296a
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-11 11:13:27 -05:00
embeddedt
1b5df63eae
Add debug log when stitcher fails 2023-03-11 11:13:07 -05:00
embeddedt
68824eaa1b
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-11 09:44:45 -05:00
embeddedt
94bc711008
Rewrite atlas size calculation logic and re-enable fast texture stitching 2023-03-11 09:38:13 -05:00
embeddedt
14e266288a
Cache BlockModelShaper.statePropertiesToString 2023-03-11 09:38:06 -05:00
embeddedt
6a7ca1e518
Remove unnecessary Files.exists call in ModFileResourcePack.getResource() 2023-03-10 20:14:11 -05:00
embeddedt
eed3a80fc1 Add support for using REI for creative search 2023-03-09 10:15:29 -05:00
embeddedt
63fa31bde1
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-07 22:26:16 -05:00
embeddedt
519e9d40f8 Turn off two features when incompatible mods are present
Fixes BetterEnd crash
Fixes #35
2023-03-07 09:38:54 -05:00
embeddedt
50b11b0e1f Turn off faster texture stitching by default, has random bugs 2023-03-06 13:06:55 -05:00
embeddedt
cb23ee5a54 Add debug tool for weird crashes, off by default 2023-03-06 13:06:15 -05:00
embeddedt
7a2b57221e Return to baking models on the main thread
Mods... as usual.
2023-03-06 09:12:04 -05:00
embeddedt
61c2b943cf
Fix world load time not being set 2023-03-05 13:32:59 -05:00
embeddedt
2e3f43674f
Fix model bakery not being initialized 2023-03-05 13:32:51 -05:00
embeddedt
5df695cbbb
Add YUNG's Better Strongholds compat 2023-03-04 22:14:35 -05:00
embeddedt
9eb3ed4273
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-04 19:24:21 -05:00
embeddedt
7b192433b7
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-04 19:22:25 -05:00
embeddedt
1c2a2c65ad
Fix some bugs 2023-03-04 19:21:49 -05:00
embeddedt
ac261a0bfd
Fix incorrectly mapped mixin 2023-03-04 17:10:56 -05:00
embeddedt
4a15e277aa
Add UID to JEI plugin 2023-03-04 16:41:52 -05:00
embeddedt
a2cbc49bb1
Hide DFU warning if Forge's DFU blocker is on 2023-03-04 16:33:02 -05:00
embeddedt
5d317b6d94
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-04 16:29:04 -05:00
embeddedt
01025d5b4d
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-04 15:05:42 -05:00
embeddedt
6d7a450ec8
Modify branding control mixin priority 2023-03-04 15:05:24 -05:00
embeddedt
8303d85b6c
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-04 13:23:53 -05:00
embeddedt
1c9935e298
Use MethodHandles to select LWJGL 3.3 methods if needed 2023-03-04 10:36:11 -05:00
embeddedt
a54e7b831a
Improve compatibility of ID desync fix, and add Roadrunner support 2023-03-04 09:10:12 -05:00
embeddedt
84ba47f174
Fix compatibility with Performant 2023-03-03 21:43:32 -05:00
embeddedt
5e296f5d3a
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-03 21:20:17 -05:00
embeddedt
010de8c30f
Mark branding mixin as not required 2023-03-03 21:20:02 -05:00
embeddedt
dbdd0a77a1
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-03 21:12:53 -05:00
embeddedt
0cf089febe Skip entity ID sync in singleplayer 2023-03-02 16:11:15 -05:00
embeddedt
e8311d0b95 Fix Twilight Forest CME during game startup 2023-03-02 16:04:03 -05:00
embeddedt
ce1462efd1 Add system to detect and correct SynchedEntityData ID mismatches
Should fix weird stacktraces being thrown when mods like Citadel
and Caves and Cliffs Backport are installed together
2023-03-02 15:53:00 -05:00
embeddedt
db95e37d22
Fix MC-218112 2023-03-01 20:03:47 -05:00