Commit Graph

1238 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
embeddedt
10bd3e1899
Merge 1.16 into 1.18 2023-07-12 19:37:02 -04:00
embeddedt
d14ae9d2c1
Fix formatting issue 2023-07-12 19:36:52 -04:00
embeddedt
3a6b5c91d5
Merge 1.19.2 into 1.19.4 2023-07-12 19:35:52 -04:00
embeddedt
1b563c30c5
Merge 1.18 into 1.19.2 2023-07-12 19:35:51 -04:00
embeddedt
9cedaf18a8
Merge 1.16 into 1.18 2023-07-12 19:35:50 -04:00
embeddedt
5fd02ffc96
Very bad hack for wiki race condition
GitHub's "concurrency" system just cancels pending jobs instead
of scheduling them
2023-07-12 19:35:23 -04:00
embeddedt
1a68035131
Merge 1.19.2 into 1.19.4 2023-07-12 19:30:47 -04:00
embeddedt
5294503483
Merge 1.18 into 1.19.2 2023-07-12 19:30:46 -04:00
embeddedt
f2d05c1355
Merge 1.16 into 1.18 2023-07-12 19:30:45 -04:00
embeddedt
8f806e6285
Use shared branch list script 2023-07-12 19:30:37 -04:00
embeddedt
29c260f7ce
Merge 1.19.2 into 1.19.4 2023-07-12 11:49:30 -04:00
embeddedt
5318347ab2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-12 11:49:19 -04:00
embeddedt
40ddd2dfdb
Merge 1.16 into 1.18 2023-07-12 11:48:01 -04:00
Kichura
d36cc4acc1
Fix python3 not having friendly name. (#160) 2023-07-12 11:37:46 -04:00
Kichura
09aae6e34c
Enhance the workflow scripts and update Gradle. (#159)
* Update workflow actions and Gradle.
* Introduce friendly names to wiki_update and release scripts.
* Only embeddedt can run release and update wiki workflows.
2023-07-12 11:19:19 -04:00
embeddedt
aff4e0c2d0
Drop chunk status transition patch from paper_chunk_patches
Research by ishland suggests that vanilla already does this, at least
since 1.18
2023-07-12 10:53:12 -04:00
embeddedt
08daaa38e9
Do not cancel running wiki jobs [skip ci] 2023-07-11 22:16:07 -04:00
embeddedt
9281344863
Merge 1.19.2 into 1.19.4 2023-07-11 22:15:10 -04:00
embeddedt
061806eb8f
Merge 1.18 into 1.19.2 2023-07-11 22:15:09 -04:00
embeddedt
8067cb6e65
Merge 1.16 into 1.18 2023-07-11 22:15:08 -04:00
embeddedt
b31381ed4d
Prevent race condition when updating wikis 2023-07-11 22:14:54 -04:00