Commit Graph
100 Commits
Author SHA1 Message Date
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
gnembon 18705e44ba fixed distance_beta app 2021-04-16 23:23:42 -03:00
gnembon 6ef85437a9 fixed ai_tracker commands 2021-04-16 23:07:00 -03:00
gnembon d0fa948a46 Merge branch 'master' into 1.17 2021-04-16 13:02:12 -03:00
gnembon df26e9853a fixed camera's commands 2021-04-16 12:34:11 -03:00
gnembon 9a6b598e48 taste the rainbow 2021-04-15 14:59:12 -03:00
gnembon 0dd88cd1dc Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java
2021-04-15 14:49:17 -03:00
gnembon 14263203c5 taste the rainbow 2021-04-15 14:47:58 -03:00
gnembon d6d3167bcf hopper counters pretty 2021-04-15 03:06:32 -03:00
gnembon a1e0cfbc69 naming 2021-04-14 22:49:06 -03:00
gnembon eff3a1734e Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-04-14 21:19:26 -03:00
gnembon 6f13b9068e running execute store had no effect, fixes #809 2021-04-14 21:19:10 -03:00
gnembon 2612dff497 Merge branch 'master' into 1.17 2021-04-14 15:07:15 -03:00
gnembon d3295e6b4e 21w15a 2021-04-14 15:07:08 -03:00
gnembon 1a96737cff 1.4.32 2021-04-14 14:35:49 -03:00
gnembon cc3723ae12 mapping 2021-04-13 19:54:23 -03:00
gnembon 2cc2101934 Merge branch '1.17' of https://github.com/gnembon/fabric-carpet into 1.17 2021-04-13 10:48:40 -03:00
gnembon b7cb73d38b Merge branch 'master' into 1.17 2021-04-13 09:10:06 -03:00
gnembon 51db851096 docs 2021-04-13 09:03:24 -03:00
gnembon 3d4fa6ae89 Merge branch 'master' into 1.17 2021-04-13 01:23:22 -03:00
gnembon f2721ab87a custom events backend, and entity attribute query. 2021-04-13 01:22:50 -03:00
gnembon 8ed4561a98 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2021-04-12 14:26:22 -03:00
gnembon 40869ef9bf moved custom arguments to before the commands and handled missing functions nicely. 2021-04-12 14:24:10 -03:00
gnembon 92cc545896 less restricting use of shapes 2021-04-12 07:57:04 -03:00
gnembon ffcc269f3a Merge branch 'master' into 1.17 2021-04-10 15:09:14 -03:00
gnembon cd9a5b96c2 fix superhot not working on singleplayer when riding stuffs 2021-04-10 14:53:48 -03:00
gnembon 37a6913e72 mark off unnecessary iface 2021-04-10 02:19:24 -03:00
gnembon ba38080208 Merge branch 'master' into 1.17 2021-04-09 01:44:08 -03:00
gnembon c264011646 cleanup 2021-04-09 01:43:54 -03:00
gnembon 93c989e2b6 added create_explosion and more event handlers. 2021-04-09 01:42:57 -03:00
gnembon 388a3de577 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
#	src/main/java/carpet/script/api/WorldAccess.java
2021-04-09 01:40:38 -03:00
gnembon e063748e83 added create_explosion and more event handlers. 2021-04-09 01:38:00 -03:00
gnembon 8903865faa Merge branch 'master' into 1.17 2021-04-07 19:12:08 -03:00
gnembon 6c9dbdda12 21w14a 2021-04-07 19:11:59 -03:00
gnembon 75a823f994 mapping 2021-04-07 19:05:45 -03:00
gnembon e0eec1bb9c 1.4.31 2021-04-07 18:49:53 -03:00
gnembon 8054e0336d mapping 2021-04-06 23:52:20 -03:00
gnembon 2e3a49756b mapping 2021-04-06 21:05:34 -03:00
gnembon 0aff2f90c3 Merge branch 'master' into 1.17 2021-04-06 20:59:59 -03:00
gnembon 6fc38d6ec1 slashes fix issues with some java versions 2021-04-06 20:57:14 -03:00
gnembon 9b9251190b Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2021-04-06 00:44:16 -03:00
gnembon 647a3a15b6 profiler rework 2021-04-06 00:41:12 -03:00
gnembon 2ed5861278 Merge branch 'master' into 1.17 2021-04-05 13:42:54 -03:00
gnembon 063b4b84ec deferred creation of a dummy entity for block breaking to when its needed. 2021-04-05 13:42:22 -03:00
gnembon 214aa45140 Merge branch 'master' into 1.17 2021-04-05 10:59:01 -03:00
gnembon e37e4050b1 get proper lazy host for execution of suggestions. Fixes #793 2021-04-05 10:58:26 -03:00
gnembon 7ab7f00316 Merge branch 'master' into 1.17 2021-04-05 09:33:24 -03:00
gnembon 6f4ee1fd00 fake players shake off players when removing 2021-04-05 09:33:04 -03:00
gnembon 8ebe0e60e4 Merge branch 'master' into 1.17 2021-04-04 22:58:44 -03:00
gnembon ebd0f78794 fix npe 2021-04-04 22:58:26 -03:00
gnembon b96ef34e31 merge fix 2021-04-04 22:36:04 -03:00
gnembon 0cce983092 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/commands/PerimeterInfoCommand.java
#	src/main/resources/carpet.mixins.json
2021-04-04 22:34:38 -03:00
gnembon f0d044a49f added scarpet to the carpet profiler 2021-04-04 22:32:34 -03:00
gnembon 51a548991d reword to properly reflect what up. fixes #761 2021-04-04 20:56:50 -03:00
gnembon 9117d85c73 for 2021-04-04 19:45:08 -03:00
gnembon dafebffb5a Rewording since all extra semicolons are now stripped in tokenization stage. Fixes #771 2021-04-04 19:22:06 -03:00
gnembon 00f932bafc Can place skulls inside when creativeNoClip. Fixes #775 2021-04-04 18:28:25 -03:00
gnembon 8f5330e241 added system_info world_spawn_point. Fixes #785 2021-04-04 17:55:57 -03:00
gnembon 27612905b8 added system_info world_spawn_point. Fixes #785 2021-04-04 17:54:05 -03:00
gnembon 3f372180e6 increased store for random seeds to 64k 2021-04-04 12:33:52 -03:00
gnembon da2873de52 Merge branch 'master' into 1.17 2021-04-03 20:31:35 -03:00
gnembon 512a1c4b28 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-04-03 13:18:03 -03:00
gnembon 5c7bbc19ad optional mixins to provide better compatibility. fixes #788 2021-04-03 13:17:34 -03:00
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon 3756ca9f86 Merge branch 'master' into 1.17 2021-03-31 22:04:24 -03:00
gnembon 470821524d 1.4.30 foreal 2021-03-31 22:03:09 -03:00
gnembon 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon b49b99aea6 21w11a mappings 2021-03-31 19:20:44 -03:00
gnembon 502c4e270e Merge branch 'master' into 1.17 2021-03-26 22:30:23 -03:00
gnembon c5f666b95c specify 2021-03-26 22:29:06 -03:00
gnembon 03e0e72c8c Merge branch 'master' into 1.17 2021-03-25 14:03:29 -03:00
gnembon 1ef764b9b1 specify 2021-03-25 14:03:09 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -03:00
gnembon 365892b9ca cleaner 2021-03-24 02:22:21 -03:00
gnembon 8be832a74c Merge branch 'master' into 1.17 2021-03-23 20:15:44 -03:00
gnembon 02e097dc4f fix 2021-03-23 04:15:51 -03:00
gnembon b246bff5a8 update 2021-03-21 03:35:41 -03:00
gnembon 4616bf4333 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/bundled/FileModule.java
2021-03-21 02:35:43 -03:00
gnembon 47f9efb0f2 extended info provided with system_info 2021-03-21 02:33:24 -03:00
gnembon 53f6a49b8d removed sun's import 2021-03-20 17:41:17 -03:00
gnembon ecb578bf49 fixed chopped directories names. 2021-03-20 17:39:37 -03:00
gnembon 1a47f4333f refactored file IO and zupport for sips 2021-03-20 06:22:23 -03:00
gnembon f8208c8334 fixed commands disappearing when using datapack command or create_datapack 2021-03-18 18:54:15 -03:00
gnembon 24e7c0fab9 command adding is due to the app refactor 2021-03-18 18:06:21 -03:00
gnembon 4fce03b17d Merge branch 'master' into 1.17 2021-03-18 00:59:11 -03:00
gnembon 087312abfa deprecating 'line' parameter for shapes 2021-03-18 00:58:38 -03:00
gnembon e2d376f3e9 merge erorr 2021-03-18 00:53:02 -03:00
gnembon e795a38b17 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2021-03-18 00:52:13 -03:00
gnembon 4fdee473f0 added lean and turn to labels 2021-03-18 00:49:21 -03:00
gnembon 544cf53fbf catching error when server is closing. 2021-03-18 00:39:54 -03:00
gnembon 7d135187b1 fixed shapes for 1.17 rendringo 2021-03-18 00:37:05 -03:00
gnembon 3156094719 1.4.30 2021-03-17 19:00:11 -03:00
gnembon 0b93101248 mapping 2021-03-17 10:42:31 -03:00
gnembon 5276061f04 Merge branch 'master' into 1.17 2021-03-17 10:20:45 -03:00
gnembon 57f34a9eac deprecated some IO functions 2021-03-17 08:23:56 -03:00
gnembon 7e0ba198e3 Merge branch 'master' into 1.17 2021-03-16 15:32:41 -03:00
gnembon 1bd6dcbf12 rework on shapes. Labels are showing up, but lines don't. 2021-03-16 15:31:58 -03:00