Commit Graph

9348 Commits

Author SHA1 Message Date
Spottedleaf
8e569ba62a Merge patches 2024-10-25 11:25:09 -07:00
Spottedleaf
ecf4d9715e Begin fixing issues
See diff in the update text file
2024-10-25 11:25:09 -07:00
Spottedleaf
47258a7118 Move common diffs to MCUtils 2024-10-25 11:25:09 -07:00
Spottedleaf
6df21e61af Start Moonrise update
This is based on Moonrise's 1.21.2 branch, but this on
1.21.1 so some diffs cannot be applied (and this doesn't
compile).

See moonrise_update_1_21_2.txt for progress
2024-10-25 11:25:09 -07:00
Lulu13022002
3518974270
fix some issues 2024-10-25 20:09:45 +02:00
Bjarne Koll
e19f48475d
Test compile fixes 2024-10-25 19:15:40 +02:00
Bjarne Koll
0a8fd78e37
Compiler issue v5 2024-10-25 18:08:28 +02:00
Bjarne Koll
bb124f4021
Compiler issues v4 2024-10-25 17:20:41 +02:00
Bjarne Koll
918ca965d9
Compiler issues v3 2024-10-25 15:15:12 +02:00
Bjarne Koll
6fb86bb20a
Compiler issues v2 2024-10-25 14:25:28 +02:00
Bjarne Koll
0f011a31b1
Some more compile issues 2024-10-25 13:34:01 +02:00
Bjarne Koll
9c83387157
Compile issues 1 2024-10-25 13:19:23 +02:00
Bjarne Koll
b06e0b0317
Work on compile errors 2024-10-25 13:13:43 +02:00
Bjarne Koll
afbb0d88dd
1037 2024-10-25 12:28:34 +02:00
Bjarne Koll
227caac7f0
Wrong attempt at Tag lifecycle 2024-10-25 12:06:49 +02:00
Bjarne Koll
6a315742d9
1020 2024-10-25 00:08:35 +02:00
Bjarne Koll
7616ebccd8
1000 2024-10-24 23:03:27 +02:00
Bjarne Koll
35e01d7a80
Update work 989 2024-10-24 22:29:29 +02:00
Shane Freeder
fe142cdcd5
Anti Xray 2024-10-24 20:10:38 +01:00
Shane Freeder
d67e55d367
Checkpoint 2024-10-24 19:40:24 +01:00
Bjarne Koll
9047541397
Upstream update 2024-10-24 19:29:35 +02:00
Bjarne Koll
fc05430719
963 2024-10-24 17:20:12 +02:00
Bjarne Koll
b2375286c9
Readd wrongly removed diff 2024-10-24 16:31:09 +02:00
Owen1212055
7d4cce94ae
Patch 2024-10-24 10:02:45 -04:00
Owen1212055
89bf08158b
Patch 2024-10-24 09:53:28 -04:00
Owen1212055
26f7b4c72e
Patch 2024-10-24 09:25:36 -04:00
Bjarne Koll
80de05ff33
Patch me this, patch me that 2024-10-24 12:22:30 +02:00
Bjarne Koll
457d03534d
Patches, patches, patches 2024-10-24 10:42:29 +02:00
Noah van der Aa
5d19e2b332
good luck americans 2024-10-24 00:42:38 +02:00
Noah van der Aa
5a6011c08c
MOOOOOOOOOOOOOORE 2024-10-24 00:32:21 +02:00
Noah van der Aa
dd87f9fe83
fix gruesome copyright violation 2024-10-24 00:11:28 +02:00
Noah van der Aa
4baf9ab44d
MOOOOOOOOOOORE 2024-10-24 00:08:29 +02:00
Noah van der Aa
d52e2d241d
MOOOOOOOORE 2024-10-23 23:35:21 +02:00
Noah van der Aa
1dc142534d
MOOOOORE 2024-10-23 23:12:09 +02:00
Noah van der Aa
cb79de80c4
moooore 2024-10-23 22:52:43 +02:00
Shane Freeder
6456b5dea8
A bunch more 637 2024-10-23 21:10:14 +01:00
Shane Freeder
cbf64163ba
A bunch of patches 2024-10-23 20:43:06 +01:00
Bjarne Koll
4db250389e
Work work work work 2024-10-23 20:50:46 +02:00
Bjarne Koll
0bb4d1d660
553 2024-10-23 20:15:25 +02:00
Bjarne Koll
2810f50ca2
503 2024-10-23 19:46:06 +02:00
Bjarne Koll
f5177aa121
Some more work 2024-10-23 17:58:11 +02:00
Bjarne Koll
1f8b53733f
440 2024-10-23 17:13:43 +02:00
Bjarne Koll
09b625eccf
400 2024-10-23 16:57:39 +02:00
Owen1212055
6bfc6db99e
Patch 2024-10-23 10:08:40 -04:00
Owen1212055
af125d26a9
Patch 2024-10-23 10:04:01 -04:00
Owen1212055
aa37f7250d
Patches 2024-10-23 09:54:09 -04:00
Bjarne Koll
5e262c1691
298 2024-10-23 15:02:51 +02:00
Bjarne Koll
f677393a88
Skip Improve-exact-choice-recipe-ingredients for now 2024-10-23 14:12:17 +02:00
Bjarne Koll
8851d25a4d
Fluid Flowing ifLoaded patch 2024-10-23 13:13:00 +02:00
Bjarne Koll
a400929816
242 2024-10-23 12:32:08 +02:00