Commit Graph
100 Commits
Author SHA1 Message Date
gnembon 1942726e20 21w20a 2021-05-19 15:30:20 -03:00
gnembon b80b555781 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java
2021-05-18 21:23:15 -03:00
gnembon edc90133b2 fix run position, fixes #866 2021-05-18 21:18:53 -03:00
gnembon 482170e49d Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-05-18 01:09:18 -03:00
gnembon f32b8e4050 semicolon fixes #863 2021-05-18 01:06:55 -03:00
gnembon f67d50d3d3 Merge branch 'master' into 1.17 2021-05-17 22:23:16 -03:00
gnembon 7380580a3e fixes #864 2021-05-17 22:20:32 -03:00
gnembon 3d25daee1f Merge branch 'master' into 1.17 2021-05-14 03:36:24 -03:00
gnembon fd492f334c moved exception handler, fixes #861 2021-05-14 03:34:19 -03:00
gnembon d2c5fcf068 Merge branch 'master' into 1.17 2021-05-13 10:58:23 -03:00
gnembon 5da6c2837a fix version 2021-05-13 10:57:12 -03:00
gnembon fb40120460 cluenap 2021-05-13 02:00:05 -03:00
gnembon 65447f09ad Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
2021-05-13 01:52:08 -03:00
gnembon ac64f82a4d Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-05-13 01:51:18 -03:00
gnembon a522e2ae37 fixed changed behaviour under java 16 2021-05-13 01:51:01 -03:00
gnembon 495a22ca0c fix concurrentModifications from Java 16 2021-05-13 01:50:29 -03:00
gnembon 727bdd7b1a 21w19a 2021-05-12 23:40:09 -03:00
gnembon 4542612bc8 Merge branch 'master' into 1.17 2021-05-12 23:09:48 -03:00
gnembon f5db84345e update toolchain to Java 16 2021-05-12 22:48:44 -03:00
gnembon 7ed96e22f1 Merge branch 'master' into 1.17 2021-05-12 17:07:13 -03:00
gnembon 1b0fc3202f Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-05-12 17:06:46 -03:00
gnembon a593f1cf14 1.4.36 2021-05-12 17:05:28 -03:00
gnembon 7a8914a0cb mapping 2021-05-12 17:03:34 -03:00
gnembon 4a6f21c18b Merge branch 'master' into 1.17 2021-05-12 12:13:15 -03:00
gnembon c9ff5fea34 snapshot 2021-05-12 12:12:33 -03:00
gnembon 407c117c29 Merge branch 'master' into 1.17 2021-05-10 01:50:09 -03:00
gnembon 451b35b6c5 % is a proper modulus operator, not reminder. #fixes 842, #fixes 843 2021-05-10 00:49:04 -03:00
gnembon 1a7acd519e Merge branch 'master' into 1.17 2021-05-07 23:50:44 -03:00
gnembon 47f8e0d26b Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-05-07 23:47:26 -03:00
gnembon 36b469f309 added drowning 2021-05-07 23:31:45 -03:00
gnembon dfa826bb24 21w18a 2021-05-05 20:34:59 -03:00
gnembon 7780a3276d Merge branch 'master' into 1.17 2021-05-05 20:20:48 -03:00
gnembon 7063d542ff 1.4.35 2021-05-05 20:19:18 -03:00
gnembon 4d15e07bae merge conflcts 2021-05-05 08:38:38 -03:00
gnembon 874b177da6 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/patches/EntityPlayerMPFake.java
2021-05-05 08:34:22 -03:00
gnembon d3aac224ff allow to spawn players when profile servers are down. 2021-05-05 08:33:47 -03:00
gnembon 5ac22aa000 mapping 2021-05-05 01:50:04 -03:00
gnembon e4ebeda1d0 mapping 2021-05-05 01:44:05 -03:00
gnembon 820c9b6489 Merge branch 'master' into 1.17 2021-05-05 01:31:00 -03:00
gnembon 1633cca07a better reporting 2021-05-05 01:23:17 -03:00
gnembon 8d97ab26a9 script compile time optimizations. 2021-05-05 00:25:31 -03:00
gnembon 0367170bac Merge branch 'master' into 1.17 2021-04-29 02:17:17 -03:00
gnembon 06c9aea326 tracking module integrity when module composition changes 2021-04-29 02:17:02 -03:00
gnembon b84478e7db 21w17a 2021-04-28 17:05:42 -03:00
gnembon 624f9973c8 Merge branch 'master' into 1.17 2021-04-28 16:50:45 -03:00
gnembon f8c3de21d3 1.4.34 2021-04-28 16:48:46 -03:00
gnembon 99e8db192a mappings 2021-04-28 01:42:49 -03:00
gnembon 988357317a Merge branch 'master' into 1.17 2021-04-26 23:29:27 -03:00
gnembon 3b3ebee48b Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-04-26 23:28:17 -03:00
gnembon 7da009fe5b docs on '...'. Addresses and fixes #833 2021-04-26 23:27:39 -03:00
gnembon 390c40ae74 little better place 2021-04-27 00:33:43 -03:00
gnembon d1e106bf82 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-04-27 00:24:40 -03:00
gnembon e8ab5f0d50 Merge branch 'master' into 1.17 2021-04-25 00:50:22 -03:00
gnembon 33c0cc6979 damage can also be reported if its == 0. Might be useful 2021-04-25 00:50:06 -03:00
gnembon 31afc28401 Merge branch 'master' into 1.17 2021-04-24 01:13:57 -03:00
gnembon 28101e716b lists are now properly mutable 2021-04-24 01:13:33 -03:00
gnembon d388c406fd lists are now properly mutable 2021-04-24 00:30:51 -03:00
gnembon ea660b954f Merge branch 'master' into 1.17 2021-04-23 22:13:26 -03:00
gnembon 9e7d6b70b7 thread exceptions are printed unscrambled 2021-04-23 22:12:38 -03:00
gnembon 01387211c2 Merge branch 'master' into 1.17 2021-04-23 21:43:42 -03:00
gnembon c476e814b4 better thread handling and removal of unused code. 2021-04-23 21:42:55 -03:00
gnembon 6adb4f7b86 Merge branch '1.17' of https://github.com/gnembon/fabric-carpet into 1.17 2021-04-23 10:59:35 -03:00
gnembon 43bb7eb11a Merge branch 'master' into 1.17 2021-04-23 10:58:55 -03:00
gnembon e22474156b maps unpack 2021-04-23 10:58:33 -03:00
gnembon 5e3812e1f0 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/api/Entities.java
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/Scoreboards.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/FunctionValue.java
#	src/main/java/carpet/script/value/NBTSerializableValue.java
2021-04-23 01:46:11 -03:00
gnembon bed9e2c60a docs 2021-04-23 01:20:42 -03:00
gnembon edca3fb131 using proper logger now 2021-04-22 22:30:45 -03:00
gnembon d072ec90c3 hold your horses 2021-04-22 22:26:35 -03:00
gnembon a6f39e2d22 scarpet LOG 2021-04-22 22:26:07 -03:00
gnembon 5edbbe3fe2 remane 2021-04-22 22:25:46 -03:00
gnembon 77fbb3af75 Merge branch 'master' into unpacker 2021-04-22 20:37:57 -03:00
gnembon 74bd0bb81e dont be lazy refactor 2021-04-22 20:37:48 -03:00
gnembon e8f135872d fixes #827 2021-04-22 08:41:27 -03:00
gnembon fc87053978 21w16a 2021-04-21 20:12:44 -03:00
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -03:00
gnembon 8c9dabdbbc 1.4.33 2021-04-21 18:41:39 -03:00
gnembon a65d16c9ba WIP unpacking of parameters. 2021-04-21 12:21:47 -03:00
gnembon 72a3d74a97 extremeBehaviours let wither spawn charged skulls at 10%, not 0.1% 2021-04-20 17:35:41 -03:00
gnembon 8870c245ff mapping 2021-04-20 00:09:00 -03:00
gnembon 4b85bdcb86 merge errors 2021-04-19 23:48:55 -03:00
gnembon 709d74ea47 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
2021-04-19 23:42:38 -03:00
gnembon ba89d0164f handling snooped commands properly 2021-04-19 23:40:22 -03:00
gnembon 5cceec9486 Merge branch 'master' into 1.17 2021-04-19 23:35:30 -03:00
gnembon b0dafccc18 re-name 2021-04-19 23:35:13 -03:00
gnembon 0d71d9c0a1 name 2021-04-19 09:35:01 -03:00
gnembon 400ed75b31 Merge branch 'master' into 1.17 2021-04-19 09:33:26 -03:00
gnembon 6677c538fa simple 2021-04-19 09:32:33 -03:00
gnembon 3915a5d889 fixed some run command behaviours. 2021-04-19 09:23:42 -03:00
gnembon e438fbf56d fix 2021-04-19 03:57:59 -03:00
gnembon d636965f59 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/logging/HUDController.java
#	src/main/java/carpet/script/api/Auxiliary.java
2021-04-19 03:51:32 -03:00
gnembon 8ed4c60b9c fix 2021-04-19 03:48:56 -03:00
gnembon fa3505763e fix 2021-04-19 03:48:37 -03:00
gnembon 3df0e3f277 Merge branch 'master' into 1.17 2021-04-18 02:45:14 -03:00
gnembon ee6ea80ce6 update 2021-04-18 01:56:59 -03:00
gnembon 9120aae313 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
2021-04-18 01:50:29 -03:00
gnembon 587e04c8db 1.17 update 2021-04-17 01:56:37 -03:00
gnembon 8f2c935fe6 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/resources/assets/carpet/scripts/ai_tracker.sc
2021-04-17 01:37:40 -03:00
gnembon 3e24c24648 silenced obtrusive log message with custom biomes. Fixes #810 2021-04-17 00:47:12 -03:00
gnembon 4e5184009d incorrect carpet data shoudn't crash the client. Fixes #812 2021-04-17 00:35:47 -03:00
gnembon 38285d4221 running functions will cause them not track the commandsource. fixes #815 2021-04-17 00:29:13 -03:00