Commit Graph

892 Commits

Author SHA1 Message Date
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
8ac43d5617
Fix incorrect import 2023-07-18 13:51:21 -04:00
embeddedt
90e63341bd
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-18 13:48:50 -04:00
embeddedt
36eb73b28e
Generify config patch to also work with Night Config Fixes mod 2023-07-18 13:48:20 -04:00
embeddedt
b499a054b9
Possible fix for the elusive Forge config corruption bug
Block file watcher from proceeding until config is done saving

Related: https://github.com/MinecraftForge/MinecraftForge/issues/9122
2023-07-18 12:44:11 -04:00
embeddedt
92643a244e
Merge 1.16 into 1.18 2023-07-17 16:08:27 -04:00
embeddedt
c3e3dff805
Return all possible states for model if given location is not an MRL 2023-07-17 16:07:51 -04:00
embeddedt
5ec070843d
Use CachedResourcePath in resource finder
Reduces memory usage by ~50%
2023-07-17 13:42:50 -04:00
embeddedt
9fbb97d0fa
Use Guava multimap for resource finder instead of custom "multi"map 2023-07-17 13:20:46 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
embeddedt
f7259f745f
Merge 1.16 into 1.18 2023-07-11 22:13:38 -04:00
embeddedt
423a550303
Add wiki update action 2023-07-11 22:12:15 -04:00
embeddedt
c1e40ebe1f
Update item empty cache patch for 1.18 2023-07-11 21:23:22 -04:00