Commit Graph

384 Commits

Author SHA1 Message Date
embeddedt
6cd49334d7
Merge 1.16 into 1.18 2023-07-05 14:47:30 -04:00
embeddedt
095b9c3277
Revamp mod warning system, also warn about FerriteCore missing 2023-07-05 14:47:17 -04:00
embeddedt
5aeea48413
Apply spotless 2023-07-05 12:47:43 -04:00
embeddedt
7632647e1d
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-07-05 12:45:02 -04:00
embeddedt
41a56fba20
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-07-05 12:35:41 -04:00
embeddedt
1600dc4f84
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-05 12:26:14 -04:00
embeddedt
46cff62796
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-05 12:18:00 -04:00
embeddedt
ce6ce1d341
Add option categories 2023-07-04 11:14:23 -04:00
embeddedt
18f78b9624
Add in-game patch descriptions 2023-07-03 17:04:20 -04:00
embeddedt
3237de7e33
Merge 1.19.4 into 1.20 2023-07-03 14:59:21 -04:00
embeddedt
37d6f477c4
Merge 1.19.2 into 1.19.4 2023-07-03 14:58:45 -04:00
embeddedt
0f90f53f53
Merge 1.18 into 1.19.2 2023-07-03 14:58:44 -04:00
embeddedt
9d5953c9f5
Merge 1.16 into 1.18 2023-07-03 14:58:06 -04:00
notlin4
6f07cbdc70
Add Traditional Chinese translation (#148) 2023-07-02 13:34:23 -04:00
embeddedt
dc8d727bdb
Update Diagonal Fences mixin 2023-07-02 13:30:43 -04:00
embeddedt
3be36f826c
Merge 1.19.4 into 1.20 2023-06-29 19:28:08 -04:00
embeddedt
dc268285b0
Add .mcmeta files to resource list to match 1.19.4+ behavior
Fixes modded texture .mcmeta files not being picked up

Fixes #145
2023-06-29 19:28:01 -04:00
embeddedt
a6cce0c043
Merge 1.19.4 into 1.20 2023-06-27 16:40:33 -04:00
embeddedt
152e795c32
Merge 1.19.2 into 1.19.4 2023-06-27 16:40:32 -04:00
embeddedt
89a78bf43b
Merge 1.18 into 1.19.2 2023-06-27 16:40:31 -04:00
embeddedt
1e9e310922
Merge 1.16 into 1.18 2023-06-27 16:40:30 -04:00
embeddedt
8bb5e464bc
Disable cache_strongholds when LittleTiles is installed
Related: #143
Related: https://github.com/CreativeMD/LittleTiles/issues/859
2023-06-27 16:39:49 -04:00
embeddedt
840cad23b8
Merge 1.19.4 into 1.20 2023-06-27 15:29:27 -04:00
embeddedt
93817c5d3a
Merge 1.19.2 into 1.19.4 2023-06-27 15:29:26 -04:00
embeddedt
470f8aed5b
Merge 1.18 into 1.19.2 2023-06-27 15:29:25 -04:00
embeddedt
e9ee866c60
Merge 1.16 into 1.18 2023-06-27 15:29:25 -04:00
embeddedt
4f711a4995
Populate isFabric earlier 2023-06-27 15:29:14 -04:00
embeddedt
ca60a13bb4
Merge 1.19.4 into 1.20 2023-06-27 11:04:06 -04:00
embeddedt
96a83533dd
Merge 1.19.2 into 1.19.4 2023-06-27 11:04:05 -04:00
embeddedt
99521e4d76
Merge 1.18 into 1.19.2 2023-06-27 11:04:04 -04:00
embeddedt
299abeb25d
Apply merge mode change to 1.18 2023-06-27 11:03:49 -04:00
embeddedt
54f55ee257
Merge 1.19.4 into 1.20 2023-06-26 21:26:28 -04:00
embeddedt
84b08ef64a
Merge 1.19.2 into 1.19.4 2023-06-26 21:26:27 -04:00
embeddedt
bd3a9eb345
Merge 1.18 into 1.19.2 2023-06-26 21:26:26 -04:00
embeddedt
a937ccb07c
Merge 1.16 into 1.18 2023-06-26 21:26:01 -04:00
embeddedt
58eaf44d89
Make mixin info clearing work on Fabric 2023-06-26 21:15:19 -04:00
embeddedt
7a2d38f2f1
Merge 1.19.4 into 1.20 2023-06-26 19:46:09 -04:00
embeddedt
370a0fad11
Merge 1.19.2 into 1.19.4 2023-06-26 19:46:09 -04:00
embeddedt
ec49868d27
Merge 1.18 into 1.19.2 2023-06-26 19:46:08 -04:00
embeddedt
25d1956da0
Merge 1.16 into 1.18 2023-06-26 19:46:07 -04:00
embeddedt
e3944d7879
Add option to aggressively clear Fabric mapping tables 2023-06-26 19:43:53 -04:00
embeddedt
af486998d2
Merge 1.19.4 into 1.20 2023-06-26 15:57:50 -04:00
embeddedt
5229643761
Add missing ExpectPlatform 2023-06-26 15:57:37 -04:00
embeddedt
8e467e8239
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-06-26 14:33:26 -04:00
embeddedt
04c6ea2e66
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-26 14:33:12 -04:00
embeddedt
b6182b4913
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-26 14:30:23 -04:00
embeddedt
ce92fedf09
Give correct MC/platform info to profiler 2023-06-26 14:24:37 -04:00
embeddedt
012ed17208
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-26 14:21:19 -04:00
embeddedt
4943702061
Add platform name to hooks 2023-06-26 14:21:07 -04:00
embeddedt
33c0cf33d9
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-26 14:14:35 -04:00
embeddedt
60525ad594
Add option to profile launch using Spark 2023-06-26 13:58:12 -04:00
embeddedt
2bad1c0226
Merge 1.19.4 into 1.20 2023-06-26 13:04:44 -04:00
embeddedt
65506ba7e1
Merge 1.19.2 into 1.19.4 2023-06-26 13:04:43 -04:00
embeddedt
c93380dcf2
Merge 1.18 into 1.19.2 2023-06-26 13:04:41 -04:00
embeddedt
7849ba16f5
Merge 1.16 into 1.18 2023-06-26 13:04:40 -04:00
embeddedt
b611830b7e
Eliminate need to use platform hook to retrieve server here 2023-06-26 13:01:53 -04:00
embeddedt
565dfb4b81
Merge 1.19.4 into 1.20 2023-06-22 13:45:27 -04:00
embeddedt
24f31dd92a
Initial version of resource pack caching for 1.19.4+ 2023-06-22 13:45:13 -04:00
embeddedt
63bcdb1019
Merge 1.19.4 into 1.20 2023-06-22 13:42:57 -04:00
embeddedt
5b2e70cda0
Merge 1.19.2 into 1.19.4 2023-06-22 13:42:56 -04:00
embeddedt
d97b18e633
Merge 1.18 into 1.19.2 2023-06-22 13:42:55 -04:00
embeddedt
6678864555
Merge 1.16 into 1.18 2023-06-22 13:42:25 -04:00
embeddedt
20ca15f0c4
Add a few more features to resource pack cache engine (for 1.19.4+) 2023-06-22 13:42:15 -04:00
embeddedt
5bd745a188
Merge 1.18 into 1.19.2 2023-06-21 21:43:29 -04:00
embeddedt
1ac69035ed
Merge 1.16 into 1.18 2023-06-21 21:41:12 -04:00
embeddedt
19c6687745
More aggressively load model files 2023-06-21 21:17:11 -04:00
embeddedt
c1c0010126
Merge 1.19.4 into 1.20 2023-06-20 14:34:54 -04:00
embeddedt
9cdeeb4c94
Merge 1.19.2 into 1.19.4 2023-06-20 14:34:53 -04:00
embeddedt
a84fa8ac0c
Merge 1.18 into 1.19.2 2023-06-20 14:34:37 -04:00
embeddedt
6a7d62b38d
Merge 1.16 into 1.18 2023-06-20 14:34:36 -04:00
embeddedt
40be7c9fc1
Add a few missing ClientOnlyMixin annotations
Related: #137
2023-06-20 10:43:17 -04:00
embeddedt
5d6566512c
Rewrite CanonizingStringMap to simply use a normal HashMap and intern keys
There are no memory savings from using the fastutil maps, and they
may be harming performance based on the Project MMO issues

Probably also the solution to #134
2023-06-20 10:31:49 -04:00
embeddedt
c1acdf1bb4
Make config wrapping possible to disable 2023-06-20 09:42:44 -04:00
embeddedt
761417833e
Merge 1.19.4 into 1.20 2023-06-12 21:58:58 -04:00
embeddedt
e5ab4df3dc
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-12 21:58:51 -04:00
embeddedt
12345a67e8
Merge 1.18 into 1.19.2 2023-06-12 21:57:43 -04:00
embeddedt
440cc21d8c
Merge 1.16 into 1.18 2023-06-12 21:57:42 -04:00
embeddedt
d242431e9a
Change dynamic_dfu to return real schemas as well 2023-06-12 21:57:22 -04:00
embeddedt
e5cc8ef97c
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-06-12 10:46:44 -04:00
embeddedt
af63a6ca09
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-12 10:46:33 -04:00
embeddedt
a13e8d98e1
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-12 10:45:39 -04:00
embeddedt
5136889c3e
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-12 10:43:52 -04:00
embeddedt
cfd3920c8c
Add tickable object framework 2023-06-12 10:24:49 -04:00
embeddedt
755bc35d09
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-07 11:45:27 -04:00
embeddedt
a7e93ad8f9
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-06-06 19:18:14 -04:00
embeddedt
57e1e54441
Tweak faster_texture_loading injection point for compatibility 2023-06-06 19:12:03 -04:00
embeddedt
aedbc88e3c
Update to 1.20-rc1 2023-06-06 12:28:30 -04:00
embeddedt
f9cbd8fa61
Merge remote-tracking branch 'origin/1.19.4' into 1.20 2023-06-06 12:01:21 -04:00
embeddedt
a614c050e7
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-06 11:57:49 -04:00
embeddedt
931bf29c47
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-06 11:52:49 -04:00
embeddedt
3996804e71
Merge remote-tracking branch 'origin/main' into 1.18 2023-06-05 19:46:52 -04:00
embeddedt
b430b67052
Return missing model for null BlockState 2023-06-05 19:43:25 -04:00
embeddedt
41c2bb733e
Add name change easter egg when running on snapshots 2023-06-03 20:01:19 -04:00
embeddedt
673e6dec8d
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-03 11:40:31 -04:00
embeddedt
f8771a260c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-03 11:31:37 -04:00
embeddedt
39531aba0e
Merge remote-tracking branch 'origin/main' into 1.18 2023-06-03 11:27:32 -04:00
embeddedt
941331f90a
Compatibility improvements for mixin.perf.nbt_memory_usage
Related: #119
2023-06-03 11:26:44 -04:00
embeddedt
a635671276
This will likely be the last ever 1.19.4 release 2023-06-02 20:17:13 -04:00
embeddedt
144bdaa301
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-06-02 20:14:14 -04:00
embeddedt
618698aab3
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-06-01 21:28:05 -04:00