Commit Graph

79 Commits

Author SHA1 Message Date
embeddedt
1501fe29e6
Deduplicate ingredient item values using reference equality of components
This is necessary to work around Neo's changes to Holder.Reference
equality

Related: #577
2025-07-02 18:16:21 -04:00
embeddedt
528d9c80c8
Depend on CTM from CF rather than tterrag maven 2025-07-01 20:44:39 -04:00
embeddedt
5ea3880e80
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-07-01 20:36:43 -04:00
embeddedt
d23b38f1be
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-06-05 19:06:16 -04:00
embeddedt
fbf4a533c2
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-06-04 22:55:55 -04:00
embeddedt
aa31256655
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-19 14:58:23 -04:00
embeddedt
7dcaa6b641
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-19 12:49:01 -04:00
embeddedt
6f3f75416f
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-15 21:45:35 -04:00
embeddedt
8a3b7f7935
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-15 21:26:09 -04:00
embeddedt
3194d30a09
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-09 22:25:19 -04:00
embeddedt
b1b42b9dd9
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-03 14:43:31 -04:00
embeddedt
048e7f7e07
Filter how much of the model registry Eternal Starlight sees
Otherwise it loads every model, AND stores it in a map, defeating
the point of dynamic resources

Related: https://github.com/LeoMinecraftModding/eternal-starlight/pull/82
2025-05-02 20:19:13 -04:00
embeddedt
18dac0d949
Fix incorrect sprite getter being used for CTM integration 2025-05-02 19:55:10 -04:00
embeddedt
2dae858652
Improve parity of dynamic resources enough to fix JAOPCA
Related: https://github.com/FTBTeam/FTB-Modpack-Issues/issues/7637
2025-05-02 19:42:57 -04:00
embeddedt
75f65535f8
Fix several mistakes in porting mixin.perf.faster_ingredients 2025-05-02 14:29:54 -04:00
embeddedt
757d8b6762
Spotless 2025-05-01 19:36:10 -04:00
embeddedt
de804c3aa6
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-01 19:33:08 -04:00
embeddedt
2673ae46ae
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-04-29 18:28:15 -04:00
embeddedt
60d3026ea6
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-04-28 19:02:46 -04:00
embeddedt
13820f7bbf
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-04-28 10:02:11 -04:00
embeddedt
7ab3f3bc97
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-04-26 19:56:39 -04:00
embeddedt
ed2ad51523
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-04-05 10:34:54 -04:00
embeddedt
aaaa8ad48a
Move capability deduplication hook to a later injection point 2025-03-06 19:51:30 -05:00
embeddedt
6eb82e1325
Deduplicate capability provider lists 2025-02-11 11:31:09 -05:00
embeddedt
74a339bc2c
Add more locking in various vanilla model loading paths 2025-01-24 09:32:06 -05:00
embeddedt
eeb842332b
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2024-12-26 15:00:06 -05:00
embeddedt
6531b69fb9
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2024-12-25 16:23:07 -05:00
embeddedt
cdfe53589e
Merge 1.20 into 1.21.1 2024-11-04 16:55:10 -05:00
embeddedt
512a7e237c
Merge remote-tracking branch 'origin/1.20' into 1.21 2024-08-10 19:17:42 -04:00
embeddedt
7db5d6a1da
Make CTM work on 1.21 2024-07-27 14:39:30 -04:00
embeddedt
631ad0528b
Fix registry progress bar on 1.21 2024-07-27 13:33:08 -04:00
embeddedt
b2eb14b766
Bump Neo version to fix config screen crash 2024-07-19 20:24:44 -04:00
embeddedt
30e91f2056
Merge remote-tracking branch 'origin/1.20' into 1.21 2024-07-19 19:21:23 -04:00
embeddedt
beccbef151
Bump Neo requirement 2024-07-12 18:45:27 -04:00
embeddedt
c3b17b2927
Update NF, remove config hacks as config system is rewritten 2024-07-11 08:00:59 -04:00
embeddedt
d7bfeedc62
Merge 1.20 into 1.21 2024-07-07 09:14:46 -04:00
embeddedt
85740f83af
Remove blast_search_trees 2024-06-28 20:20:06 -04:00
embeddedt
d46d24542f
Update NeoForge, adjust dynamic resources for NF API 2024-06-18 21:49:23 -04:00
embeddedt
1b6075562c
Fix wrong location type being passed to model registry 2024-06-14 19:15:16 -04:00
embeddedt
f2379dc9e3
Update to 1.21 full release 2024-06-13 17:27:20 -04:00
embeddedt
6e9dfaf0c6
Enable NeoForge project 2024-06-08 21:01:23 -04:00
embeddedt
aa2a3817ba
Update NeoForge, work around buggy hasErrors method 2024-06-03 18:52:12 -04:00
embeddedt
f13910a6ed
Update NeoForge 2024-05-07 10:39:52 -04:00
embeddedt
bebf3ccec2
Update for NeoForge changes 2024-04-29 15:12:45 -04:00
embeddedt
89592a2c42
Fix dynamic resources mixin on NeoForge 2024-04-25 19:39:27 -04:00
embeddedt
7ee968f719
Spotless 2024-04-24 09:26:10 -04:00
embeddedt
2cce200e4d
Update to 1.20.5 2024-04-24 09:17:55 -04:00
embeddedt
95cd576c68
Merge 1.20 into 1.20.4 2024-03-27 12:15:14 -04:00
embeddedt
add7dd4609
Deholderize item mesher mixin 2024-03-21 14:14:35 -04:00
embeddedt
827550e8af
Update CTM integration for 1.20.4
Requires https://github.com/Chisel-Team/ConnectedTexturesMod/pull/229 to be built from source
2024-03-21 14:10:56 -04:00