Commit Graph

1336 Commits

Author SHA1 Message Date
embeddedt
e86787c663
Merge 1.19.4 into 1.20 2023-07-16 16:58:47 -04:00
embeddedt
24ec6f154a
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-16 16:58:41 -04:00
embeddedt
c4abe1cf05
Merge 1.18 into 1.19.2 2023-07-15 21:32:20 -04:00
embeddedt
6f710f1f6b
Merge 1.16 into 1.18 2023-07-15 21:32:20 -04:00
embeddedt
33d27ff04b
Fix memory leak on Fabric from models being saved to the vanilla map 2023-07-15 21:32:02 -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
2c53c01cbc
Improve patchlist formatting 2023-07-15 17:10:09 -04:00
embeddedt
a8fd35fd15
JiJ required version of fabric-resource-loader-v0 module
Related: #163
2023-07-15 16:26:58 -04:00
embeddedt
d9f93ec67e
Merge 1.19.4 into 1.20 2023-07-15 15:07:38 -04:00
embeddedt
18e354d0ae
Merge 1.19.2 into 1.19.4 2023-07-15 15:07:37 -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
ff292cfabc
Merge 1.19.4 into 1.20 2023-07-14 13:57:40 -04:00
embeddedt
76d6ff14c2
Merge 1.19.2 into 1.19.4 2023-07-14 13:57:13 -04:00
embeddedt
89522a8197
Merge 1.18 into 1.19.2 2023-07-14 13:54:50 -04:00
embeddedt
a2eacc0fd3
Merge 1.16 into 1.18 2023-07-14 13:54:49 -04:00
embeddedt
565cc23c6c
Only apply Parchment mappings if version is provided 2023-07-14 13:54:23 -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
dc0ea4d828
Merge 1.19.4 into 1.20 2023-07-13 20:12:46 -04:00
embeddedt
ec1bacd1dd
Merge 1.19.2 into 1.19.4 2023-07-13 20:12:46 -04:00
embeddedt
0ebb566645
Merge 1.18 into 1.19.2 2023-07-13 20:12:45 -04:00
embeddedt
7c3b01c911
Merge 1.16 into 1.18 2023-07-13 20:12:44 -04:00
embeddedt
ec02a77c19
Add tag cleaner script to help with changelog issues 2023-07-13 20:12:03 -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
eecf9f0726
Merge 1.19.4 into 1.20 2023-07-13 14:58:37 -04:00
embeddedt
9f212fc475
Merge 1.19.2 into 1.19.4 2023-07-13 14:58:36 -04:00
embeddedt
40ec3f14bf
Do not run Decorative Blocks fix without Decorative Blocks installed
🤦‍♂️
2023-07-13 14:58:19 -04:00
embeddedt
c98721056d
Merge 1.19.4 into 1.20 2023-07-12 19:37:05 -04:00
embeddedt
d2fe664fe5
Merge 1.19.2 into 1.19.4 2023-07-12 19:37:04 -04:00
embeddedt
ad35fc535e
Merge 1.18 into 1.19.2 2023-07-12 19:37:03 -04:00