Commit Graph
100 Commits
Author SHA1 Message Date
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 f0bd19d17f Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2022-01-19 22:51:58 +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 5abbae5b62 Merge branch 'master' into future 2022-01-19 20:03:57 +01:00
gnembon 9f5ac8f52b Merge branch 'master' into future 2022-01-13 01:58:34 +01:00
gnembon 35d095c92f added missing sounds, colors and materials. fixes #1228 2022-01-13 01:58:12 +01:00
gnembon eb186fb61e Merge branch 'master' into future 2022-01-13 00:04:32 +01:00
gnembon fc4c721510 Merge branch 'master' into future
# Conflicts:
#	src/main/java/carpet/mixins/PlayerManager_fakePlayersMixin.java
2022-01-12 23:25:13 +01:00
gnembon b46a4d9668 update new loader issues 2022-01-12 23:24:23 +01:00
gnembon 74f6e57edc Merge branch 'master' into future 2022-01-12 22:53:45 +01:00
gnembon 77f8d2cbd7 update issues 2022-01-11 23:57:50 +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
gnembon 5a55666f94 Merge branch 'master' into future 2021-12-11 22:30:54 +01:00
gnembon 5dca846363 fixes ranges of perimeterinfo. fixes #1207 2021-12-11 22:30:42 +01:00
gnembon 4a1a710eb0 why not, may affect #1195, but I doubt 2021-12-06 01:20:21 +01:00
gnembon fe6018a43b allowing event callbacks be added concurrently (e.g. registered event while handling some other events), with safe event pruning. fixes #1193 fixes #889 2021-12-06 01:02:37 +01:00
gnembon 73e7a56b91 Merge branch 'master' into future 2021-11-30 18:44:08 +01:00
gnembon f5915fdfde Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-11-30 18:42:55 +01:00
gnembon d1bcb6c5dc 1.4.56 2021-11-30 18:42:05 +01:00
gnembon 3ff2b2efbc fix snafu 2021-11-30 18:41:17 +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 0177ef4298 Merge branch 'master' into future 2021-11-30 03:36:00 +01:00
gnembon 06eda1052f boi 2021-11-30 03:35:48 +01:00
gnembon 5be52c993c Merge branch 'master' into future 2021-11-30 03:29:24 +01:00
gnembon 1cefef82f7 no-bs world height info 2021-11-30 03:28:44 +01:00
gnembon 4aab5256aa Merge branch 'master' into future
# Conflicts:
#	docs/scarpet/api/BlocksAndWorldAccess.md
2021-11-30 03:00:05 +01:00
gnembon 16e1b7952e sample_noise keywords and docs 2021-11-30 02:59:08 +01:00
gnembon 74e177d18d renamed query_noise to sample_noise 2021-11-30 02:52:55 +01:00
gnembon 6c7ac72c3e rc-4 2021-11-30 02:46:12 +01:00
gnembon dc25b617c1 Merge branch 'master' into future 2021-11-30 00:53:25 +01:00
gnembon 7a4c094607 fixes #1186 added carpetCommandPermissionLevel to allow admins to control who has access to /carpet command. 2021-11-29 23:27:54 +01:00
gnembon 6150e1f29c Merge branch 'master' into future 2021-11-29 00:10:47 +01:00
gnembon f5900cffc6 more code, simpler mixin 2021-11-29 00:10:29 +01:00
gnembon 4cea6d3872 Merge branch 'master' into future 2021-11-28 23:34:31 +01:00
gnembon 4af1d66450 docs 2021-11-28 23:33:06 +01:00
gnembon 9b793de377 fix #1188 fix structure eligibility with strongholds 2021-11-28 23:32:24 +01:00
gnembon a990be607f allowed plopping of all sorts of structures regardless of required conditions 2021-11-28 20:23:41 +01:00
gnembon c0b79df6f6 fixes #1115 fixed structure_eligibility to 1.18 2021-11-28 15:47:08 +01:00
gnembon 3312c00ee8 Merge branch 'master' into future 2021-11-27 22:22:38 +01:00
gnembon 339633f1f0 fixes #1103 game will close peacefully when running ticks from scarpet 2021-11-27 21:14:59 +01:00
gnembon 0e1a8f20d4 fixes #1105 maxEntityCollisions will not affect maxEntityCramming setting 2021-11-27 20:58:23 +01:00
gnembon 7bd18a27e4 fixes #1113 boo 2021-11-27 20:29:16 +01:00
gnembon 18c728db2e fixes #1172 lol 2021-11-27 20:11:05 +01:00
gnembon 547ed9b6b9 fixes #1178 Yo 2021-11-27 19:36:44 +01:00
gnembon 0f57bf0bc6 fixes #1187 Ye 2021-11-27 19:09:35 +01:00
gnembon 9750dd9e78 Merge branch 'master' into future
# Conflicts:
#	src/main/java/carpet/fakes/ClientSettingsC2SPacketInterface.java
#	src/main/java/carpet/mixins/ClientSettingsC2SPacket_scarpetMixin.java
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
2021-11-27 18:55:05 +01:00
gnembon 5daad2d832 rc3 2021-11-27 14:09:52 +01:00
gnembon 2bef83ecfa Merge branch 'master' into future 2021-11-27 11:13:43 +01:00
gnembon 4d9c5eb391 docs 2021-11-25 21:45:53 +01:00
gnembon 0387b2f75e 1.18-rc1 2021-11-25 21:40:15 +01:00
gnembon deda62aa5f Merge branch 'master' into future 2021-11-23 22:46:34 +01:00
gnembon 2f7433ecb1 fixes #1181 Revert "Optimize explosion BlockState caching (#1156)"
This reverts commit 5005268df4.
2021-11-23 22:46:15 +01:00
gnembon 58bda9cc32 1.18-pre7 2021-11-23 22:11:27 +01:00
gnembon ff44e847c0 Merge branch 'master' into future 2021-11-23 22:03:43 +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 1a27226c65 17 2021-11-18 18:47:33 +01:00
gnembon 2c47523ae7 Merge branch 'master' into future 2021-11-18 18:47:20 +01:00
gnembon e8f1d85824 16 2021-11-18 18:47:06 +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 59e0a9ebaf Merge branch 'master' into future 2021-11-17 20:17:04 +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 964ff4bb6b Merge branch 'master' into future
# Conflicts:
#	src/main/resources/fabric.mod.json
2021-11-16 20:44:35 +01:00
gnembon 63aa9ab902 one more java again 2021-11-16 20:41:20 +01:00
gnembon d09ecf17fb one less java 2021-11-16 20:27:38 +01:00
gnembon b64427a4ac Merge branch 'master' into future
# Conflicts:
#	src/main/resources/fabric.mod.json
2021-11-16 20:14:38 +01:00
gnembon 61af94f0bf Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-11-16 20:13:40 +01:00
gnembon 3eae059ee0 one more java 2021-11-16 20:13:08 +01:00
gnembon ab989155ad Merge branch 'master' into future 2021-11-16 20:11:49 +01:00
gnembon 03d5aa5904 one more java 2021-11-16 20:11:19 +01:00
gnembon 0998a78cae well 2021-11-13 21:32:09 +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 3ea1be1170 Merge branch 'future' of https://github.com/gnembon/fabric-carpet into future 2021-11-11 23:21:02 +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 70aa6acecb Merge branch 'master' into future 2021-11-10 22:09:20 +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 31a6bd21df Merge branch 'master' into future 2021-10-20 23:24:52 -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