embeddedt
|
3162a531b7
|
Merge 1.19.4 into 1.20
|
2023-07-19 16:46:15 -04:00 |
|
embeddedt
|
02f6431109
|
Merge 1.19.2 into 1.19.4
|
2023-07-19 16:46:14 -04:00 |
|
embeddedt
|
af5ece3fe9
|
Merge 1.18 into 1.19.2
|
2023-07-19 16:46:13 -04:00 |
|
embeddedt
|
91980319d2
|
Merge 1.16 into 1.18
|
2023-07-19 16:46:13 -04:00 |
|
embeddedt
|
8383053b5c
|
Fix wall block deduplication crashing when invasive mods replace vanilla walls
Related: #168
|
2023-07-19 16:45:32 -04:00 |
|
embeddedt
|
30f483245c
|
Merge 1.19.4 into 1.20
|
2023-07-19 12:20:52 -04:00 |
|
embeddedt
|
8527594b3b
|
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4
|
2023-07-19 12:17:13 -04:00 |
|
embeddedt
|
12ec9b08bf
|
Update ItemOverrideBakedModel for 1.19
|
2023-07-19 12:15:29 -04:00 |
|
embeddedt
|
3fed2ef08d
|
Merge remote-tracking branch 'origin/1.18' into 1.19.2
|
2023-07-19 12:09:39 -04:00 |
|
embeddedt
|
d9b9586af3
|
Update item override patch to 1.18
|
2023-07-19 12:08:15 -04:00 |
|
embeddedt
|
6fda7393b3
|
Merge remote-tracking branch 'origin/1.16' into 1.18
|
2023-07-19 11:51:00 -04:00 |
|
embeddedt
|
ac436db456
|
Add support to dynamic resources for item overrides
|
2023-07-19 11:50:16 -04:00 |
|
embeddedt
|
e65f8fbb32
|
Add option to override overrides
Absolutely no support is guaranteed when this is used
|
2023-07-19 10:05:09 -04:00 |
|
embeddedt
|
e34beb5775
|
Merge 1.19.4 into 1.20
|
2023-07-17 16:09:27 -04:00 |
|
embeddedt
|
95c3044a40
|
Merge 1.19.2 into 1.19.4
|
2023-07-17 16:09:26 -04:00 |
|
embeddedt
|
ab7c982589
|
Merge 1.18 into 1.19.2
|
2023-07-17 16:08:28 -04:00 |
|
embeddedt
|
92643a244e
|
Merge 1.16 into 1.18
|
2023-07-17 16:08:27 -04:00 |
|
embeddedt
|
5ec070843d
|
Use CachedResourcePath in resource finder
Reduces memory usage by ~50%
|
2023-07-17 13:42:50 -04:00 |
|
embeddedt
|
c51b0585a2
|
Merge 1.19.4 into 1.20
|
2023-07-16 20:00:08 -04:00 |
|
embeddedt
|
2f7bd0e083
|
Merge 1.19.2 into 1.19.4
|
2023-07-16 20:00:07 -04:00 |
|
embeddedt
|
594c47f08b
|
Merge 1.18 into 1.19.2
|
2023-07-16 20:00:06 -04:00 |
|
embeddedt
|
94d5121a26
|
Merge 1.16 into 1.18
|
2023-07-16 20:00:06 -04:00 |
|
embeddedt
|
4f186c03f5
|
Filter valid paths using explicit joiner instead of Path.toString
to avoid issues on Windows
|
2023-07-16 19:59:22 -04:00 |
|
embeddedt
|
9a5edb9431
|
Merge 1.19.4 into 1.20
|
2023-07-15 20:37:19 -04:00 |
|
embeddedt
|
2a328356cd
|
Merge 1.19.2 into 1.19.4
|
2023-07-15 20:37:18 -04:00 |
|
embeddedt
|
48fdb94343
|
Merge 1.18 into 1.19.2
|
2023-07-15 20:37:18 -04:00 |
|
embeddedt
|
67343b5680
|
Merge 1.16 into 1.18
|
2023-07-15 20:37:17 -04:00 |
|
embeddedt
|
ad948f0ec1
|
Rework wall block caching to cache collision shapes as well
|
2023-07-15 20:36:56 -04:00 |
|
embeddedt
|
c63a8fa21e
|
Deduplicate wall block shapes
|
2023-07-15 20:23:59 -04:00 |
|
embeddedt
|
09d24c542e
|
Merge 1.18 into 1.19.2
|
2023-07-15 15:07:17 -04:00 |
|
embeddedt
|
9fcc1f5dc2
|
Merge 1.16 into 1.18
|
2023-07-15 15:05:56 -04:00 |
|
embeddedt
|
dff181accb
|
Allow corrupt JSONs when scanning models for textures
Fixes Hexerei textures being missing on 1.18
|
2023-07-15 15:05:25 -04:00 |
|
embeddedt
|
faccdb0ed7
|
Merge 1.19.4 into 1.20
|
2023-07-13 21:43:49 -04:00 |
|
embeddedt
|
b0815bcae6
|
Merge 1.19.2 into 1.19.4
|
2023-07-13 21:43:48 -04:00 |
|
embeddedt
|
c684b56124
|
Merge 1.18 into 1.19.2
|
2023-07-13 21:43:48 -04:00 |
|
embeddedt
|
dccde1a422
|
Merge 1.16 into 1.18
|
2023-07-13 21:43:47 -04:00 |
|
embeddedt
|
6cd99383b9
|
Disable item_cache_flag when Lithium or derivatives are present,
as they rely on the broken cache logic
|
2023-07-13 21:43:40 -04:00 |
|
embeddedt
|
0116a31616
|
Hotfix for Class.descriptorString() not existing on Java 8
|
2023-07-13 21:20:16 -04:00 |
|
embeddedt
|
1531762524
|
Merge 1.19.4 into 1.20
|
2023-07-13 19:40:40 -04:00 |
|
embeddedt
|
b79a66ce83
|
Merge 1.19.2 into 1.19.4
|
2023-07-13 19:40:39 -04:00 |
|
embeddedt
|
17d479bc93
|
Merge 1.18 into 1.19.2
|
2023-07-13 19:40:38 -04:00 |
|
embeddedt
|
5f59fdf471
|
Merge 1.16 into 1.18
|
2023-07-13 19:40:37 -04:00 |
|
其智乃反不能及
|
a1ee34bb1c
|
Update zh_cn.json (#153)
|
2023-07-13 19:39:48 -04:00 |
|
embeddedt
|
a799afc19c
|
Merge 1.19.4 into 1.20
|
2023-07-13 17:08:59 -04:00 |
|
embeddedt
|
24130cde74
|
Merge 1.19.2 into 1.19.4
|
2023-07-13 17:08:58 -04:00 |
|
embeddedt
|
bd179f817f
|
Merge 1.18 into 1.19.2
|
2023-07-13 17:08:57 -04:00 |
|
embeddedt
|
fd72aa4fac
|
Merge 1.16 into 1.18
|
2023-07-13 17:08:57 -04:00 |
|
embeddedt
|
793fb5f388
|
Allow spam_thread_dump to work even earlier
|
2023-07-13 17:08:32 -04:00 |
|
embeddedt
|
73e8631fcd
|
Merge 1.19.4 into 1.20
|
2023-07-12 11:49:31 -04:00 |
|
embeddedt
|
29c260f7ce
|
Merge 1.19.2 into 1.19.4
|
2023-07-12 11:49:30 -04:00 |
|