Commit Graph

753 Commits

Author SHA1 Message Date
FlorianMichael
2971cdedeb
Merge branch 'main' into dev
# Conflicts:
#	gradle.properties
2024-02-14 02:30:09 +01:00
EnZaXD
ea875acac9
24w06a 2024-02-07 19:56:44 +01:00
FlorianMichael
49a01fe81b
Merge remote-tracking branch 'origin/main' 2024-02-03 23:23:58 +01:00
FlorianMichael
6c8e0c5a89
Fixed publishing 2024-02-03 23:23:44 +01:00
Kichura
2ab66b0d21
Fix 1.12.2 not being recognized as supported version. (#308) 2024-02-03 23:17:25 +01:00
FlorianMichael
cc78074c22
Merge remote-tracking branch 'origin/main' 2024-02-03 23:08:10 +01:00
FlorianMichael
1429bebf80
Only apply mixin on the client 2024-02-03 23:07:57 +01:00
EnZaXD
1aa6903a96
Merge pull request #307 from Kichura/main
Final dependency updates, ViaFabric 0.4.13
2024-02-03 23:01:38 +01:00
Kichura
266ab67253
Final dependency, ViaFabric 0.4.13. 2024-02-03 22:55:55 +01:00
FlorianMichael
6f67cbdea4
Merge dev into main 2024-02-03 22:53:22 +01:00
FlorianMichael
d83ed61e8e
Updated README file 2024-02-03 22:49:17 +01:00
FlorianMichael
6dd9ad9361
There you go, 1.12 support
Co-authored-by: Kichura <business_squeezy@outlook.com>
2024-02-03 22:39:26 +01:00
FlorianMichael
4a4b4a3cf1
Merge branch 'main' into dev 2024-02-03 21:42:12 +01:00
EnZaXD
6c8250a995
Merge pull request #306 from HowardZHY/dev
Update zh_*.json
2024-02-03 19:48:32 +01:00
Howard ZHY
f88f73d395 Update zh_*.json
Use Author instead of I
2024-02-04 02:45:12 +08:00
EnZaXD
e9887d8f45
Merge pull request #305 from Kichura/main
Fix typo in config file in "force disable" line
2024-02-03 17:03:02 +01:00
Kichura
33429ee6ce
Fix typo in config file in "force disable" line. 2024-02-03 17:01:13 +01:00
EnZaXD
4959dceffc
24w05b 2024-02-02 11:30:25 +01:00
EnZaXD
b4295d17ff
Merge pull request #303 from Kichura/main
Update wrapper-validation-action to v2
2024-01-31 14:11:34 +01:00
Kichura
6645435c2c
Update wrapper-validation-action to v2. 2024-01-31 00:57:27 +01:00
FlorianMichael
24cfacbd70
Merge branch 'main' into dev
# Conflicts:
#	gradle.properties
#	viafabric-mc120/build.gradle.kts
2024-01-29 19:42:30 +01:00
FlorianMichael
7426e648a6
Merge remote-tracking branch 'origin/main' 2024-01-29 19:39:23 +01:00
FlorianMichael
132bad3de9
Updated all fabric.mod.json files 2024-01-29 19:39:10 +01:00
EnZaXD
2635f15469
24w04a 2024-01-26 13:57:57 +01:00
Kichura
81e6a158f6
Ensure the JDK is defaulted in shell. (#301) 2024-01-21 14:06:27 +01:00
FlorianMichael
f0d771d2e3
Include license header to class files 2024-01-21 11:38:02 +01:00
FlorianMichael
ff68b7af26
Added copyright profile 2024-01-21 11:33:04 +01:00
FlorianMichael
c675d34296
Removed unsupported mod warnings
Reverts c21985cc24
2024-01-21 11:15:39 +01:00
FlorianMichael
68ecd55d8c
Normalize Unique fields in mixins 2024-01-21 11:11:09 +01:00
FlorianMichael
08f153f434
Don't rely on deprecated Via API 2024-01-21 10:54:24 +01:00
FlorianMichael
1f9cbd2853
Cleanup of the last PR. 2024-01-21 10:43:22 +01:00
Kichura
67c977009b
Fix loom 1.5 screwing up the buildscript (#300)
* Finally fix the cursed loom 1.5 update.

* Formatstyle adjustment.

Tabs make this look ugly.
2024-01-21 10:38:51 +01:00
EnZaXD
051e944693
Merge pull request #298 from Kichura/main
Update CI and fabric
2024-01-20 23:25:25 +01:00
EnZaXD
db5a12bbcd
Fabric Loom 1.5 2024-01-20 23:25:08 +01:00
Kichura
0c6fcbd383
Update CI and fabric. 2024-01-20 23:21:14 +01:00
EnZaXD
8a3e961550
Merge pull request #297 from Kichura/patch-1
Update JDK to 17.0.10
2024-01-20 09:01:57 +01:00
Kichura
8a1be75f27
Update JDK to 17.0.10. 2024-01-19 22:46:13 +01:00
EnZaXD
ad47afb6e0
Merge pull request #296 from Kichura/main
Use JDK 17 instead of 21 in terms of codespaces
2024-01-16 03:29:08 +01:00
Kichura
55dab979ec
Use JDK 17 instead of 21 in terms of codespaces. 2024-01-16 00:04:11 +01:00
FlorianMichael
7e12d8024f
[ci skip] Updated README.md 2024-01-15 00:04:14 +01:00
FlorianMichael
dac4b4a771
Update Fabric API 2024-01-14 23:59:12 +01:00
FlorianMichael
f946c609e4
Switch back to master VV branch 2024-01-14 23:52:51 +01:00
FlorianMichael
d2cd87c35b
Merge branch 'dev'
# Conflicts:
#	gradle.properties
2024-01-14 23:49:42 +01:00
FlorianMichael
d6386bf679
Updated Via API usage 2023-12-29 04:42:35 +01:00
EnZaXD
4baeaea176
Merge pull request #294 from Kichura/patch-1
Don't upload artifacts twice, only on build script
2023-12-26 16:46:56 +01:00
Kichura
acb9c5e519
Don't upload artifacts twice, only on build script. 2023-12-26 16:41:47 +01:00
FlorianMichael
9bc6fb90c9
Update Fabric Loader to 0.15.3 2023-12-26 16:30:26 +01:00
EnZaXD
8fdc3cd902
Merge pull request #293 from Kichura/main
Undo ViaVersion dependency but update loader to 0.15.3
2023-12-26 16:29:13 +01:00
Kichura
b2e8af0b25
Undo ViaVersion dependency but update loader to 0.15.3. 2023-12-26 16:17:36 +01:00
Kichura
510d0fe993
Update 1.20.x's build dependencies (#292)
* Update Mod Menu and Fabric API for 1.20.x.

* Update 1.20.4 yarn to build 3.
2023-12-24 00:24:50 +01:00