Commit Graph

915 Commits

Author SHA1 Message Date
embeddedt
95496fc27c
Merge 1.19.2 into 1.20 2023-12-23 17:15:32 -05:00
embeddedt
d8da6c08a0
Merge 1.18 into 1.19.2 2023-12-23 17:15:26 -05:00
embeddedt
7547a9227c
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-12-23 17:15:10 -05:00
embeddedt
8058d4caa9
Remove dynamic item overrides
This system conflicts with other optimization mods (e.g. Noxesium)
and is annoying to maintain. Please stop using item overrides and
use real items/mods instead
2023-12-23 17:12:50 -05:00
embeddedt
7be97e61e8
Merge 1.20 into 1.20.4 2023-12-23 15:57:41 -05:00
embeddedt
f35d920801
Merge 1.19.2 into 1.20 2023-12-23 15:57:41 -05:00
embeddedt
7efe10a8a9
Merge 1.18 into 1.19.2 2023-12-23 15:57:40 -05:00
embeddedt
94fbefd901
Update mixin 2023-12-23 15:57:12 -05:00
embeddedt
b23502c32b
Fix incorrect merge 2023-12-23 15:56:28 -05:00
embeddedt
d03571cb05
Merge 1.20 into 1.20.4 2023-12-23 15:55:42 -05:00
embeddedt
88a276eed9
Update mixin target 2023-12-23 15:55:32 -05:00
embeddedt
8bcd85d079
Merge 1.18 into 1.19.2 2023-12-23 15:54:20 -05:00
embeddedt
8729e50f1b
Merge 1.19.2 into 1.20 2023-12-23 15:54:20 -05:00
embeddedt
ee8093fc50
Merge 1.16 into 1.18 2023-12-23 15:54:19 -05:00
embeddedt
a7c2424b14
Handle missing models in item overrides 2023-12-23 15:53:40 -05:00
embeddedt
5ff2951b5a
Work around Flywheel leaving freed buffers in BufferBuilder 2023-12-23 14:12:16 -05:00
embeddedt
324fb3af97
Merge 1.20 into 1.20.4 2023-12-21 16:51:12 -05:00
embeddedt
4d0444ba2a
Merge 1.19.2 into 1.20 2023-12-21 16:51:11 -05:00
embeddedt
f59aa5b19c
Merge 1.18 into 1.19.2 2023-12-21 16:51:10 -05:00
embeddedt
00fa8227c3
Merge 1.16 into 1.18 2023-12-21 16:50:40 -05:00
embeddedt
bc2e84bacc
Cache item override model instance 2023-12-21 16:50:08 -05:00
embeddedt
9dcc87b227
Merge 1.20.2 into 1.20.4 2023-12-14 21:12:00 -05:00
embeddedt
0eb70468a1
Merge 1.20 into 1.20.2 2023-12-14 21:11:59 -05:00
embeddedt
b5c4b79eb8
Merge 1.19.2 into 1.20 2023-12-14 21:11:58 -05:00
embeddedt
5e8a111fed
Merge 1.18 into 1.19.2 2023-12-14 21:11:57 -05:00
embeddedt
fe65ffa4d1
Merge 1.16 into 1.18 2023-12-14 21:11:56 -05:00
embeddedt
240fa4b510
Implement dynamic model cache on vanilla ItemModelShaper 2023-12-14 21:11:10 -05:00
embeddedt
ba2b740075
Merge remote-tracking branch 'origin/1.20' into 1.20.4 2023-12-14 20:46:02 -05:00
embeddedt
8677532629
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2023-12-14 20:44:44 -05:00
embeddedt
559bdb612c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-12-14 20:41:47 -05:00
embeddedt
5579743b6c
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-12-14 20:39:20 -05:00
embeddedt
81836a838d
Implement caching on the blockstate and item to model maps 2023-12-14 20:10:54 -05:00
embeddedt
1f66c7becd
Merge 1.20.2 into 1.20.3 2023-12-06 20:44:42 -05:00
embeddedt
ccc21d76d8
Merge 1.20 into 1.20.2 2023-12-06 20:44:41 -05:00
embeddedt
46127b50f3
Invalidate blockstate cache in place of initCache 2023-12-06 20:44:31 -05:00
embeddedt
bf69e58169 Merge remote-tracking branch 'origin/neoforge/1.20.2' into 1.20.3 2023-12-05 18:01:12 -05:00
embeddedt
c6b38f340a
Second rename pass, reaches main menu 2023-12-03 20:33:08 -05:00
embeddedt
69a9aa76da
Compiles, not yet running 2023-12-03 20:20:33 -05:00
embeddedt
efa46c3842 Merge 1.20.2 into 1.20.3 2023-11-30 13:42:36 -05:00
embeddedt
473597a915 Fix config screen background 2023-11-30 13:42:22 -05:00
embeddedt
84061b197f 1.20.3-rc1 2023-11-30 13:38:30 -05:00
embeddedt
29d1f88539
Merge 1.20 into 1.20.2 2023-11-27 07:43:52 -05:00
embeddedt
0ff032bd1a
Merge 1.20.2 into 1.20.3 2023-11-27 07:43:20 -05:00
embeddedt
e34e9fcf8b
Merge branch 'propagations/1.20' into propagations/1.20.2 2023-11-27 07:43:15 -05:00
embeddedt
2e9166c7df
Rewrite missing model emulation functionality for 1.20+ dynres implementation
Fixes #308
2023-11-27 07:38:53 -05:00
embeddedt
7be382a3ce More ClientOnlyMixin 2023-11-23 10:16:01 -05:00
embeddedt
9861926f1d Merge 1.20.2 into 1.20.3 2023-11-23 10:12:21 -05:00
embeddedt
acb6809459 Merge 1.20 into 1.20.2 2023-11-23 10:12:20 -05:00
embeddedt
7c57ffd2c6 Merge 1.19.2 into 1.20 2023-11-23 10:12:19 -05:00
embeddedt
bf43ba7bf4 Merge 1.18 into 1.19.2 2023-11-23 10:12:18 -05:00
embeddedt
c0f162716b Merge 1.16 into 1.18 2023-11-23 10:12:17 -05:00
embeddedt
2946b3a7b5 Handle path arrays with empty components correctly
Related: #304
2023-11-23 10:11:45 -05:00
embeddedt
61ce2e7117 Mark buffer builder fix as client only 2023-11-23 09:58:20 -05:00
embeddedt
fd975388ca Merge 1.20.2 into 1.20.3 2023-11-23 09:51:42 -05:00
embeddedt
13ee6b3523 Merge 1.20 into 1.20.2 2023-11-23 09:51:14 -05:00
embeddedt
1002baa6b1 Merge 1.19.2 into 1.20 2023-11-23 09:51:13 -05:00
embeddedt
0b9b49c360 Merge 1.18 into 1.19.2 2023-11-23 09:51:05 -05:00
embeddedt
0aea884052 Merge 1.16 into 1.18 2023-11-23 09:51:03 -05:00
embeddedt
a1f3300a8a More ClientOnlyMixin
Related: #297
2023-11-23 09:50:47 -05:00
embeddedt
af8e23f41a Fix mixin target 2023-11-21 12:38:02 -05:00
embeddedt
27142d2c42
Merge 1.20.2 into 1.20.3 2023-11-11 17:26:28 -05:00
embeddedt
3fb3bb3c11
Merge 1.19.2 into 1.20 2023-11-11 17:26:27 -05:00
embeddedt
c672948d8c
Merge 1.20 into 1.20.2 2023-11-11 17:26:27 -05:00
embeddedt
8bc92e051e
Merge 1.18 into 1.19.2 2023-11-11 17:26:26 -05:00
embeddedt
adc3dbaf57
Merge 1.16 into 1.18 2023-11-11 17:26:25 -05:00
embeddedt
7c0f8b8bef
Stop logging for suspicious async chunkloads if they complete quickly enough 2023-11-11 17:26:21 -05:00
embeddedt
0a418bc55d Merge 1.20.2 into 1.20.3 2023-11-07 17:27:30 -05:00
embeddedt
d8263c55f8 Merge 1.20 into 1.20.2 2023-11-07 17:27:28 -05:00
embeddedt
abfaea19a5 Merge 1.19.2 into 1.20 2023-11-07 17:27:26 -05:00
embeddedt
3e52c75d0f Merge 1.18 into 1.19.2 2023-11-07 17:27:24 -05:00
embeddedt
552eea488d Merge 1.16 into 1.18 2023-11-07 17:27:22 -05:00
embeddedt
215b797e7b Fix replaceAll being broken on the model registry
Thanks Guava.
2023-11-07 17:26:01 -05:00
embeddedt
8bb70222ce
Merge 1.18 into 1.19.2 2023-11-05 21:59:08 -05:00
embeddedt
2f3df11220
Merge 1.16 into 1.18 2023-11-05 21:59:07 -05:00
embeddedt
134dc0ef20
Fix path replacements being too aggressive 2023-11-05 21:58:42 -05:00
embeddedt
45c11ea7e0
Merge 1.20.2 into 1.20.3 2023-11-05 21:37:18 -05:00
embeddedt
894173cf1d
Remove unused import 2023-11-05 21:35:15 -05:00
embeddedt
fc52570951
Update cache_profile_texture_url for 1.20.2 2023-11-05 21:32:27 -05:00
embeddedt
207521f778
Merge 1.20.2 into 1.20.3 2023-11-05 21:25:23 -05:00
embeddedt
9efe912090
Merge 1.20 into 1.20.2 2023-11-05 21:25:22 -05:00
embeddedt
e859ce8eb6
Avoid slow getHash call when retrieving skins
Co-authored-by: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com>
2023-11-05 21:22:17 -05:00
embeddedt
86c6e90436 Support closed flag on BufferBuilders
Thanks to Moulberry for noting this vanilla change
2023-11-02 13:35:25 -04:00
embeddedt
915de8187e 23w44a 2023-11-02 13:34:15 -04:00
embeddedt
181be3cf80 Merge 1.20.2 into 1.20.3 2023-10-30 14:54:27 -04:00
embeddedt
79751dac21 Merge 1.20 into 1.20.2 2023-10-30 14:54:21 -04:00
embeddedt
58f79e25e9
Update Diagonal Fences mixin on 1.19 2023-10-30 09:41:48 -04:00
embeddedt
d358ea37a8
Remove Diagonal Fences mixin on 1.20+, mod now uses dynres-compatible logic
Related: #199
2023-10-30 09:30:52 -04:00
embeddedt
2a6077cb65
Merge branch '1.20' of https://github.com/embeddedt/ModernFix into 1.20 2023-10-29 21:17:49 -04:00
embeddedt
184dec0739
Merge 1.20.2 into 1.20.3 2023-10-29 21:17:26 -04:00
embeddedt
1339fc7af6
Merge 1.20 into 1.20.2 2023-10-29 21:17:26 -04:00
embeddedt
d557725c82
Merge 1.19.2 into 1.20 2023-10-29 21:17:24 -04:00
embeddedt
6b01f0450b
Merge 1.16 into 1.18 2023-10-29 21:15:43 -04:00
embeddedt
6a8d63a2cd
Merge 1.18 into 1.19.2 2023-10-29 21:15:43 -04:00
embeddedt
ced7f866d8
Revert "Use copy-on-write map for permanent overrides"
This solution is also not good enough. It causes catastrophic
time complexity with mods that call get and put in rapid
succession (i.e. every Forge mod using ModelBakeEvent)
2023-10-29 21:14:51 -04:00
embeddedt
375276ea1f
Disable mixin.feature.registry_event_progress by default 2023-10-29 21:05:17 -04:00
embeddedt
624a4483eb
Merge 1.20.2 into 1.20.3 2023-10-29 11:44:32 -04:00
embeddedt
3b7d2f1e2e
Merge 1.20 into 1.20.2 2023-10-29 11:44:31 -04:00
embeddedt
59235e6a21
Fix spotless 2023-10-29 11:44:25 -04:00
embeddedt
91a084f860
Merge 1.20.2 into 1.20.3 2023-10-29 11:41:44 -04:00
embeddedt
546a362d9c
Merge 1.20 into 1.20.2 2023-10-29 11:41:44 -04:00