icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,583 Commits 1 Branch 0 Tags
7ee1baab2c8a3701b3b94f2d8bc0fccd7ac2c3eb
Commit Graph
709 Commits
Author SHA1 Message Date
gnembon 0ed7d16a46 Merge branch 'master' into future 2022-01-19 22:52:14 +01:00
gnembon 173ce1c832 oups, for posterity I guess 2022-01-19 22:51:51 +01:00
gnembon 0de2d74ef0 Merge branch 'master' into future 2022-01-19 21:46:37 +01:00
gnembon c0bba54799 1.4.57 2022-01-19 21:20:37 +01:00
gnembon ec1993efb1 mappings 2022-01-19 20:31:30 +01:00
gnembon 529a5b358d Merge branch 'master' into future 
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/annotation/AnnotationParser.java
#	src/main/java/carpet/script/utils/BiomeInfo.java
#	src/main/resources/fabric.mod.json
 2022-01-11 23:44:52 +01:00
altrisi 34e32973fa Use Fabric's newly exposed version APIs for app requirement parsing, expand it to allow wildcards and change load stopping to be a special exception (#1252) 2022-01-08 23:26:14 +01:00
gnembon 73e7a56b91 Merge branch 'master' into future 2021-11-30 18:44:08 +01:00
gnembon d1bcb6c5dc 1.4.56 2021-11-30 18:42:05 +01:00
gnembon 7b0ea88a90 1.18 2021-11-30 18:07:04 +01:00
gnembon eb60aaa445 Merge branch 'master' into future 2021-11-30 18:04:34 +01:00
gnembon 197612ade7 1.4.55 2021-11-30 18:03:19 +01:00
gnembon 6c7ac72c3e rc-4 2021-11-30 02:46:12 +01:00
gnembon 5daad2d832 rc3 2021-11-27 14:09:52 +01:00
gnembon 0387b2f75e 1.18-rc1 2021-11-25 21:40:15 +01:00
gnembon 58bda9cc32 1.18-pre7 2021-11-23 22:11:27 +01:00
gnembon 368229d607 1.18-pre6 2021-11-22 22:27:52 +01:00
gnembon e4356c5fa0 17 2021-11-21 21:24:44 +01:00
gnembon 4cdb1bae28 Merge branch 'master' into future 
# Conflicts:
#	src/main/java/carpet/settings/SettingsManager.java
 2021-11-17 20:49:05 +01:00
gnembon c5594812d4 1.4.54 2021-11-17 20:48:30 +01:00
gnembon 90964e2e57 1.18-pre4 2021-11-17 20:45:25 +01:00
gnembon f60de2198f 1.18-pre2 2021-11-16 21:11:00 +01:00
gnembon adaf19170d mappings 2021-11-16 21:08:26 +01:00
gnembon 669f8be992 Merge branch 'master' into future 2021-11-11 23:22:18 +01:00
gnembon 639ef06e50 1.4.53 2021-11-11 23:22:03 +01:00
gnembon 5a6fc19bb0 1.18-pre1 2021-11-11 22:49:26 +01:00
gnembon 6468ac37c7 mapping 2021-11-11 19:40:17 +01:00
gnembon 6a3bf73801 Merge branch 'master' into future 2021-11-04 00:48:29 +01:00
gnembon b93e3238b7 1.4.52 2021-11-04 00:46:27 +01:00
gnembon 1642976d0d 21w44a 2021-11-04 00:34:40 +01:00
gnembon 26a6d9713d Merge branch 'master' into future 2021-10-28 01:47:32 -03:00
gnembon 1cc690fb79 1.4.51 2021-10-28 01:47:08 -03:00
gnembon 679c20d78e 21w43a 2021-10-28 00:04:54 -03:00
gnembon 81f0b8a8da mappings 2021-10-27 23:28:44 -03:00
gnembon f19b314b78 Merge branch 'master' into future 2021-10-21 08:44:52 -03:00
gnembon 9ac3654a2c 1.4.50 2021-10-21 08:43:52 -03:00
gnembon 377c044c21 Merge branch 'master' into future 2021-10-21 01:01:28 -03:00
gnembon f413a3d93f 1.4.49 2021-10-21 01:00:25 -03:00
gnembon 074fd910cf 21w42a 2021-10-20 23:05:27 -03:00
gnembon 0f4c418a0e just mappings 2021-10-20 22:44:46 -03:00
gnembon 033ef064c5 Merge branch 'master' into future 2021-10-13 19:39:22 -03:00
gnembon 9e9a80373d 1.4.48 2021-10-13 19:38:02 -03:00
gnembon 543a4aa38f 21w41a 2021-10-13 19:36:28 -03:00
gnembon cfaf596c29 update mappings and 21w40a, apparently. 2021-10-12 23:54:25 -03:00
gnembon 0e88714def Merge branch 'master' into future 2021-09-24 09:32:51 -03:00
gnembon 9b8572041c 1.4.47 2021-09-24 09:32:13 -03:00
gnembon e849cdf6c1 21w38a 2021-09-24 09:29:13 -03:00
gnembon 7b9e5e6feb mappings 2021-09-22 21:12:11 -03:00
gnembon 54ec1f223c Merge branch 'master' into future 2021-09-18 12:50:14 -03:00
gnembon 50f8a025a9 1.4.46 2021-09-18 12:39:17 -03:00