Commit Graph
100 Commits
Author SHA1 Message Date
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
gnembon 044d191409 Merge branch 'master' into future 2021-10-20 21:40:57 -03:00
gnembon fa36c52ba8 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-10-17 00:28:14 -03:00
gnembon db5d4532b8 encode_nbt is incosistent with documentation, #fixes https://discord.com/channels/882822986795716608/882826588348092457/899049240771309638 2021-10-17 00:25:03 -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 322f9124b5 Merge branch 'master' into future 2021-10-13 19:10:50 -03:00
gnembon 5bf79cdf31 Merge branch 'master' into future 2021-10-13 00:15:14 -03:00
gnembon 7c31d51048 rotfl 2021-10-13 00:14:47 -03:00
gnembon 159e2d94a0 rotfl 2021-10-13 00:11:00 -03:00
gnembon cfaf596c29 update mappings and 21w40a, apparently. 2021-10-12 23:54:25 -03:00
gnembon 6a03675b4f Merge branch 'master' into future 2021-10-12 23:24:41 -03:00
gnembon f9207a1b4b Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-10-12 22:57:55 -03:00
gnembon 5b80c845c6 added liquidDamageDisabled inspired by TIS additions and ported by permission by Fallen Breath 2021-10-12 22:57:47 -03:00
gnembon 4a580a5a42 clarify number 2021-10-11 06:19:24 -03:00
gnembon 736c10abe6 fixed completion 2021-10-11 05:30:39 -03:00
gnembon 0e88714def Merge branch 'master' into future 2021-09-24 09:32:51 -03:00
gnembon 3383aa15b4 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-09-24 09:32:25 -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
gnembon 77ecc6975d note on biome API changes for 1.18 2021-09-18 12:36:55 -03:00
gnembon f517b8d4b0 Merge branch 'master' into future 2021-09-18 09:36:26 -03:00
gnembon 18c3dc13fe fixed plop not plopping unconfigured features. 2021-09-18 09:36:06 -03:00
gnembon bc175509a2 21w37a 2021-09-18 08:46:27 -03:00
gnembon 70754dbfe8 Merge branch 'master' into future
# Conflicts:
#	gradle.properties
2021-09-17 03:15:30 -03:00
gnembon c788b122a7 advance mappings 2021-09-17 03:14:35 -03:00
gnembon 9652573c10 removed time restrictions from /spawn test 2021-09-11 00:37:54 -03:00
gnembon 86d89aab20 added death messages control to cleanLogs (require showDeathMessages to be false as well). Fixes #1095 2021-09-08 21:13:17 -03:00
gnembon bea986315e 1.18-exp7 2021-09-08 16:27:26 -03:00
gnembon 9dad47d7a0 Merge branch 'master' into future 2021-09-08 16:22:44 -03:00
gnembon 36df542072 lazy functions with set parameter sizes will report an error if no properly specced. Fixes #1064 2021-09-06 23:05:13 -03:00
gnembon 229d0b037b events handling is disabled now when potentially triggered from the scarpet script preventing from recursive callbacks. 2021-09-06 02:37:08 -03:00
gnembon 8325783bf4 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-09-04 23:45:19 -03:00
gnembon 572fc8573e fixes to handling of NBT tags. Fixes #1080 2021-09-04 23:44:45 -03:00
gnembon 98cd057fd4 1.18-exp6 2021-09-01 17:52:41 -03:00
gnembon f808848356 Merge branch 'master' into future
# Conflicts:
#	gradle.properties
2021-08-25 16:55:32 -03:00
gnembon 9f30c47f19 update loom 2021-08-25 16:53:43 -03:00
gnembon 8bf4b9be7c mappings 2021-08-25 16:40:33 -03:00
gnembon 2d96f968e5 1.18-exp5 2021-08-25 16:36:53 -03:00
gnembon 7e67966fd2 Merge branch 'master' into future 2021-08-25 15:19:30 -03:00
gnembon a9db4099d0 Compatibility with paper cardboard. Fixes #1078 2021-08-25 00:19:31 -03:00
gnembon 35508c3635 Compatibility with paper cardboard. Fixes #1078 2021-08-25 00:17:31 -03:00
gnembon 3f9a73ac32 rename test to testcarpet. Fixes #1079 2021-08-25 03:00:26 -03:00
gnembon 49e4c41d2b fixed spawn command for some non-standard languages. Fixes #1073 2021-08-22 23:11:59 -03:00
gnembon 6f80c7959e node optimizations should optimize only one argument depending on associativity. Fixes #1046 2021-08-22 22:51:23 -03:00
gnembon 61052ea06d remove limits from fact in favour of estimation. Fixes #1065 2021-08-19 09:59:35 -03:00
gnembon 6222c97375 fixed unknown recipe types. Fixes #1068 2021-08-19 09:43:00 -03:00
gnembon 482d73ef9b exp4 2021-08-19 09:27:57 -03:00
gnembon e54f84d2f3 Merge branch 'master' into future 2021-08-17 18:12:30 -03:00
gnembon 25ec92c4c8 Merge branch 'master' into future 2021-08-11 17:11:49 -03:00
gnembon e38490b880 1.4.45 2021-08-11 17:09:21 -03:00
gnembon 77aa52dc0e 1.18 exp 3. Changes to custom mobcap. 2021-08-11 17:04:56 -03:00
gnembon 783f3f49f0 Merge branch 'master' into future 2021-08-11 15:02:51 -03:00
gnembon 92063fa891 Handles rogue spawn reports with an error message. Fixes #1052 2021-08-09 00:36:09 -03:00
gnembon 16f3832d16 Fixes inventory behaviour with stackable empty shulker boxes. fixes #1048 2021-08-08 23:08:14 -03:00
gnembon 6594c2c07f Merge branch 'master' into future 2021-08-08 21:51:42 -03:00
gnembon 19ad8cfbf3 Mixin mixup, borken profiler sections. Fixes #1027 2021-07-24 22:40:33 -03:00
gnembon 0e9df3701f rework for events and other stored functions. Fixes #984 2021-07-22 22:22:38 -03:00
gnembon 97e7d660e4 fix inventories for armorstands, fixes #1017 2021-07-21 09:09:50 -03:00
gnembon 8fdd02dc7b 1.18 exp2 2021-07-20 23:17:04 -03:00
gnembon e69dbc7c28 Merge branch 'master' into future 2021-07-20 22:50:32 -03:00
gnembon 09a0924579 Merge branch 'master' into future 2021-07-14 01:10:41 -03:00
gnembon 62f2b97303 marked 1.18 inaccessible options. 2021-07-14 01:09:51 -03:00
gnembon 9cdc297314 1.18 exp1 2021-07-14 01:07:19 -03:00
gnembon b85311e3bf Merge branch 'master' into future
# Conflicts:
#	gradle.properties
2021-07-14 00:58:12 -03:00
gnembon 4dd3cc7fd6 mappings 2021-07-14 00:57:37 -03:00