Commit Graph
100 Commits
Author SHA1 Message Date
gnembon 38b2e83d05 fixed crash report for 1.17 2021-05-31 16:14:10 -03:00
gnembon 5f630e7d1a Merge branch 'master' into 1.17 2021-05-31 15:54:32 -03:00
gnembon c55019d048 fixed broken movable TEs under Java 16 2021-05-31 15:40:44 -03:00
gnembon 83109eda9a Merge branch 'master' into 1.17 2021-05-28 13:51:09 -03:00
gnembon bd689b418a prevent events to be called when script server is gone. 2021-05-28 13:50:50 -03:00
gnembon b082de1071 Merge branch 'master' into 1.17 2021-05-28 13:37:33 -03:00
gnembon 566b6c394b Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-05-28 13:37:19 -03:00
gnembon 15f7d52b4c server closing for SP is signalled too late. 2021-05-28 13:37:04 -03:00
gnembon 3e02df9150 Merge branch 'master' into 1.17 2021-05-27 15:01:17 -03:00
gnembon f64cf67e41 1.17-pre1 2021-05-27 15:01:07 -03:00
gnembon 63901ebb0c 1.4.38 2021-05-27 14:30:36 -03:00
gnembon e2dfbc5bdd Merge branch 'master' into 1.17 2021-05-27 01:56:13 -03:00
gnembon 328ded0537 added /script remove app command 2021-05-27 01:54:26 -03:00
gnembon f2e759130a make sure player names do not cause players to get disconnected 2021-05-25 20:10:47 -03:00
gnembon 7871727217 Merge branch 'master' into 1.17 2021-05-25 17:38:11 -03:00
gnembon b96a1b1216 Merge branch 'master' into 1.17 2021-05-25 17:25:55 -03:00
gnembon eb927f5e7c Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-05-25 17:24:29 -03:00
gnembon f18cc1c836 more thread safe carpet globs 2021-05-25 17:24:14 -03:00
gnembon d6bde212e2 Merge branch 'master' into 1.17 2021-05-25 07:45:58 -03:00
gnembon 5d00709b1f fix for downloadable zip folders 2021-05-25 07:31:22 -03:00
gnembon c720c2c935 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/value/EntityValue.java
#	src/main/java/carpet/script/value/ListValue.java
2021-05-25 01:08:32 -03:00
gnembon cab37358ed Merge branch 'master' into 1.17 2021-05-25 00:41:29 -03:00
gnembon db9039c02a added app resources for apps from appstores 2021-05-25 00:41:06 -03:00
gnembon 1091171870 fix cast exception 2021-05-23 18:06:45 -03:00
gnembon 93b8d98a79 Merge branch 'master' into 1.17 2021-05-23 14:01:18 -03:00
gnembon 1b39feaab7 wrap stream before closing zip files. 2021-05-23 14:00:49 -03:00
gnembon 69d1558e4d mappings 2021-05-22 22:19:28 -03:00
gnembon 95d8c5fd90 Merge branch 'master' into 1.17 2021-05-22 22:14:43 -03:00
gnembon fb4c40c951 separated properly client disconnect from server shutdown allowing for retaining carpet settings till world is gone. Fixes #854 2021-05-22 22:14:16 -03:00
gnembon c6db496a1f fixes behaviour of folder and file detections in java 16, fixes #869 2021-05-22 01:57:04 -03:00
gnembon f21897fab1 added custom context to be used in optimization evaluations that should expose all programmers issues, while allowing reporting errors to the error snooping entity. Fixes #875 2021-05-22 01:21:20 -03:00
gnembon deb4f78347 rotfl fixes #874 2021-05-21 23:08:33 -03:00
gnembon dbae5813f0 added framework for auto resource fetching for the apps 2021-05-21 22:31:02 -03:00
gnembon 74cc9a39e1 Merge branch 'master' into 1.17 2021-05-21 14:14:18 -03:00
gnembon 79fb489ab7 renames 2021-05-21 14:13:50 -03:00
gnembon 1b49bfe21f updates 2021-05-21 04:45:23 -03:00
gnembon 84dd972758 Merge branch 'master' into 1.17 2021-05-21 04:42:21 -03:00
gnembon 22abf2fab6 minor docs 2021-05-21 04:40:32 -03:00
gnembon 7fd49e0f04 fix client methods in biome, fixes #870 2021-05-21 04:22:18 -03:00
gnembon 4466c77780 small refactor, customizable appstore, minimize app calls. 2021-05-21 03:50:38 -03:00
gnembon 866f1f1497 moved downloader 2021-05-19 20:46:19 -03:00
gnembon f56b22be6a 1.4.37 2021-05-19 18:19:06 -03:00
gnembon 47d629bac2 Merge branch 'master' into 1.17 2021-05-19 15:30:42 -03:00
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