Commit graph

3163 commits

Author SHA1 Message Date
Sollace
fcb58b759a
Merge branch '1.20.2' into 1.20.4 2024-06-30 00:28:58 +01:00
Sollace
0077b44d8c
Merge branch '1.20.1' into 1.20.2 2024-06-30 00:28:38 +01:00
­Sollace
74fae35865 New translations en_us.json (German) 2024-06-26 22:53:33 +01:00
­Sollace
3e05fbe027 New translations en_us.json (French) 2024-06-26 20:34:14 +01:00
­Sollace
5a087d88e3 New translations en_us.json (French) 2024-06-26 19:32:50 +01:00
­Sollace
7cc1aeb7a5 New translations en_us.json (Chinese Traditional) 2024-06-26 13:56:40 +01:00
­Sollace
1636bf18f8 New translations en_us.json (Chinese Simplified) 2024-06-26 13:56:38 +01:00
­Sollace
c869e0b5e1 New translations en_us.json (German) 2024-06-24 23:05:21 +01:00
­Sollace
7f866a5af8 New translations en_us.json (German) 2024-06-24 22:01:17 +01:00
­Sollace
5756cad2ab New translations en_us.json (English (upside down)) 2024-06-24 16:48:48 +01:00
­Sollace
883332b415 New translations en_us.json (English, United Kingdom) 2024-06-24 16:48:46 +01:00
­Sollace
ff677f17ff New translations en_us.json (Chinese Traditional) 2024-06-24 16:48:45 +01:00
­Sollace
a9d7e15659 New translations en_us.json (Russian) 2024-06-24 16:48:44 +01:00
­Sollace
dc6f39df45 New translations en_us.json (German) 2024-06-24 16:48:42 +01:00
­Sollace
1838118290 New translations en_us.json (French) 2024-06-24 16:48:41 +01:00
­Sollace
ff6b55e4c9 New translations en_us.json (English (upside down)) 2024-06-24 15:32:59 +01:00
­Sollace
5e27ffc7bb New translations en_us.json (English, United Kingdom) 2024-06-24 15:32:57 +01:00
­Sollace
5f26d6cb63 New translations en_us.json (Chinese Traditional) 2024-06-24 15:32:56 +01:00
­Sollace
bedc298bd8 New translations en_us.json (German) 2024-06-24 15:32:53 +01:00
­Sollace
c91c0feb75 New translations en_us.json (French) 2024-06-24 15:32:52 +01:00
­Sollace
7fa2363979 New translations en_us.json (Chinese Simplified) 2024-06-24 15:32:51 +01:00
­Sollace
2a0c28cec5 New translations en_us.json (Russian) 2024-06-24 04:59:21 +01:00
­Sollace
d5fb4d4640 New translations en_us.json (English (upside down)) 2024-06-24 03:02:48 +01:00
­Sollace
05e399ad84 New translations en_us.json (English, United Kingdom) 2024-06-24 03:02:47 +01:00
­Sollace
c740cbd908 New translations en_us.json (Chinese Traditional) 2024-06-24 03:02:46 +01:00
­Sollace
dc894af0c2 New translations en_us.json (Russian) 2024-06-24 03:02:45 +01:00
­Sollace
995fe3645d New translations en_us.json (German) 2024-06-24 03:02:43 +01:00
­Sollace
6e88b51889 New translations en_us.json (French) 2024-06-24 03:02:42 +01:00
­Sollace
c7a2e4bc1e New translations en_us.json (Chinese Simplified) 2024-06-24 03:02:41 +01:00
Sollace
ad5bb061f6
Merge branch '1.20.2' into 1.20.4 2024-06-24 02:41:47 +01:00
Sollace
44709daaf1
Merge branch '1.20.1' into 1.20.2 2024-06-24 02:41:33 +01:00
Sollace
636c84db3b
Merge branch 'l10n_1.20.1' into 1.20.1 2024-06-24 02:41:15 +01:00
­Sollace
cce26951f0
Update README.md
God damn markdown
2024-06-24 02:40:02 +01:00
Sollace
0b7ef78cb8
Merge branch '1.20.2' into 1.20.4 2024-06-24 02:38:53 +01:00
Sollace
ebbb87a0b8
Fix spell recipes (1.20.2) 2024-06-24 02:01:28 +01:00
Sollace
cc8bc28432
Merge branch '1.20.1' into 1.20.2 2024-06-24 01:34:03 +01:00
Sollace
6eb2464d78
Revert mixinextras usage 2024-06-24 01:25:28 +01:00
Sollace
74a08b4820
Merge branch '1.20.1' into 1.20.2 2024-06-24 01:15:50 +01:00
­Sollace
6d1f703cf1 New translations en_us.json (Chinese Simplified) 2024-06-24 01:04:02 +01:00
­Sollace
b0c721fd7f New translations en_us.json (Chinese Simplified) 2024-06-23 23:30:55 +01:00
­Sollace
85e906c1ae New translations en_us.json (English (upside down)) 2024-06-23 17:27:29 +01:00
­Sollace
0c8f0f2b01 New translations en_us.json (English, United Kingdom) 2024-06-23 17:27:28 +01:00
­Sollace
953124d66f New translations en_us.json (Chinese Traditional) 2024-06-23 17:27:26 +01:00
­Sollace
62f19409a9 New translations en_us.json (Russian) 2024-06-23 17:27:25 +01:00
­Sollace
7e80227305 New translations en_us.json (German) 2024-06-23 17:27:24 +01:00
­Sollace
2914b3d4e6 New translations en_us.json (French) 2024-06-23 17:27:23 +01:00
­Sollace
30994885a7 New translations en_us.json (Chinese Simplified) 2024-06-23 17:27:21 +01:00
Sollace
a6b16ec09f
Remove debug code 2024-06-23 17:01:02 +01:00
Sollace
f6668eff72
Added seapony's grace/seapony's ire status effects. Mining blocks in a monument will cause seaponies to lose their grace. Fixes #390 2024-06-23 16:59:34 +01:00
Sollace
d4e3feacee
Fixed ability cooldown not ticking when there is not ability in the slot. Fixes #366 2024-06-23 16:57:47 +01:00