Commit Graph
639 Commits
Author SHA1 Message Date
gnembon ea9ea3f279 Merge branch 'master' into future
# Conflicts:
#	gradle.properties
2022-03-31 23:11:36 +02:00
gnembon bee280f696 1.4.69 2022-03-31 23:06:35 +02:00
gnembon 72fe6eed88 curse 2022-03-31 22:36:52 +02:00
gnembon ef3e71b9b6 22w13a 2022-03-31 20:23:49 +02:00
gnembon 2b7201612f Merge branch 'master' into future 2022-03-24 21:54:28 +01:00
gnembon 6d10f36428 1.4.68 2022-03-24 21:53:58 +01:00
gnembon ab07a6807a 22w12a 2022-03-24 21:48:29 +01:00
gnembon 0773a7df3c Merge branch 'master' into future 2022-03-18 00:26:12 +01:00
gnembon 814147dcca 1.4.67 2022-03-18 00:21:48 +01:00
gnembon 302a7b4817 fixes for 22w11a 2022-03-17 20:21:55 +01:00
gnembon 704117f413 1.4.66 2022-02-28 19:54:02 +01:00
gnembon 871f5da0d1 1.18.2 2022-02-28 19:53:25 +01:00
gnembon 90e0329fbc 1.4.65 2022-02-23 22:16:52 +01:00
gnembon d24f711e27 1.18.2-pre3 2022-02-23 22:15:48 +01:00
gnembon 2e20d51089 1.4.64 2022-02-22 02:25:55 +01:00
gnembon b06d68186e 1.18.2-pre2 2022-02-22 01:15:43 +01:00
gnembon 4387c18c62 1.4.63 2022-02-20 10:08:52 +01:00
gnembon c01ad9ce9d 1.18.2-pre 2022-02-20 01:50:46 +01:00
gnembon 8c127c5cef 1.4.62 2022-02-16 22:28:44 +01:00
gnembon fa1e6ce086 22w07a
- disabled "sample_noise"
2022-02-16 22:23:52 +01:00
gnembon 91eefb4608 1.4.61 2022-02-10 03:18:19 +01:00
gnembon 212814f46d 22w06a 2022-02-10 03:15:53 +01:00
gnembon da557664c3 22w05a 2022-02-02 19:58:09 +01:00
gnembon ac7da0c2ca 22w05a 2022-02-02 19:55:54 +01:00
gnembon eca6391627 1.4.59 test 2022-01-29 00:02:52 +01:00
altrisi 06af9ce8b1 Migrate the Carpet codebase to Mojang Mappings 2022-01-24 20:33:16 +01:00
gnembon ad0bbfbce7 1.4.58 2022-01-20 01:48:50 +01:00
gnembon 16d8d00939 cf target 2022-01-20 01:45:26 +01:00
gnembon f469810fbc 22w03a 2022-01-20 00:20:52 +01:00
gnembon 5f8bb863aa oups, for posterity I guess 2022-01-19 23:17:31 +01:00
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