Commit Graph
1482 Commits
Author SHA1 Message Date
gnembon d4c0c7307b Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-06-05 00:50:20 -03:00
gnembon 50b414727c refactor 2020-06-05 00:48:02 -03:00
gnembon 6c01ae6807 1.16-pre1 2020-06-04 16:55:21 -03:00
gnembon c61429099a mappings 2020-06-04 15:59:46 -03:00
gnembon 0a21c4fa21 Merge branch 'master' into 1.16 2020-06-04 13:28:27 -03:00
gnembon 8b2e703128 adding width as optional for Spheres 2020-06-04 13:27:58 -03:00
gnembon 252dc29e18 update 1.16 2020-06-04 02:40:40 -03:00
gnembon 8fe3508fdd Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-06-04 02:35:05 -03:00
gnembon 2e8ebc402e allowed 'follow' in draw_shape 2020-06-04 02:33:32 -03:00
gnembon bd29eef3e8 tuning of shapes 2020-06-03 23:03:11 -03:00
gnembon 5285eb33d6 tuning of shapes 2020-06-03 22:49:23 -03:00
gnembon 9aad10ed98 Merge branch '1.16' of https://github.com/gnembon/fabric-carpet into 1.16 2020-06-03 03:51:24 -03:00
gnembon bf2d412a66 Merge branch 'master' into 1.16 2020-06-03 03:47:55 -03:00
gnembon f14fcbba9f added spheres to draw_shape 2020-06-03 03:47:38 -03:00
gnembon e2e45bb20d added __on_player_connects and dis. fixes #294 2020-06-03 00:09:34 -03:00
gnembon c2381b88e7 Merge branch 'master' into 1.16 2020-06-02 21:05:56 -03:00
gnembon a7cd2c49cc added view_distance to API 2020-06-02 18:44:23 -03:00
gnembon c94ba6a021 mappings 2020-06-02 12:23:52 -03:00
gnembon b5e34ad030 Merge branch 'master' into 1.16 2020-06-02 11:59:38 -03:00
gnembon 46409c8daa added optional options for draw_shape and fixed docs 2020-06-02 11:58:14 -03:00
gnembon 4271aa3a8e removed ability to automatically register events by running imports code, part two for 304 2020-06-01 22:11:37 -03:00
gnembon 01a2d9ea6e removed potential ConcurrentModificationException chance, part one for 304 2020-06-01 21:10:42 -03:00
gnembon 59be8b3fb4 redocced to draw_shape 2020-06-01 12:05:01 -03:00
gnembon f97ca9e9bd mappings 2020-06-01 03:25:09 -03:00
gnembon d5cb99d7f9 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-06-01 03:05:23 -03:00
gnembon a86c127c72 added params and changed syntax for draw_shape 2020-06-01 03:01:39 -03:00
gnembon b186e21aea imports 2020-05-31 19:48:35 -03:00
gnembon f498d9bae0 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-05-31 19:43:44 -03:00
gnembon 6e4b5ebaf6 detecting refreshed shapes 2020-05-31 19:42:49 -03:00
gnembon ab0bc6f221 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-05-31 14:41:12 -03:00
gnembon b29896858e much better, fixes #301 2020-05-31 14:29:51 -03:00
gnembon 0b22359f8c mappings 2020-05-31 03:18:40 -03:00
gnembon 1c46393c4d Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-31 02:54:14 -03:00
gnembon 47452b5b12 added marker lines and boxes with client synchro fixes. 2020-05-31 01:57:04 -03:00
gnembon 7c0a377d71 shapes renderer WIP 2020-05-29 14:06:32 -03:00
gnembon 3b588e8488 20w22a 2020-05-29 12:15:51 -03:00
gnembon cd1e9d7264 Merge branch 'master' into 1.16 2020-05-27 00:53:49 -03:00
gnembon a1200d4c37 fixed so modify(..,'effect',...) does what docs say. 2020-05-27 00:53:21 -03:00
gnembon 243c3290ae mappings 2020-05-27 00:46:44 -03:00
gnembon cf817c2e39 mappings 2020-05-21 14:23:04 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03:00
gnembon abd5f178be Merge branch 'master' into 1.16 2020-05-20 02:13:37 -03:00
gnembon 934038828c handled errors in server docked tasks to continue stack trace of internal exceptions. 2020-05-20 02:13:12 -03:00
gnembon ab86fc9292 added 'portal_cooldown' and 'portal_timer' to entity API (query and modify) 2020-05-20 02:09:57 -03:00
gnembon 208c066da1 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-05-19 18:18:27 -03:00
gnembon 66c222a77a poi results now come out sorted by distance 2020-05-19 18:17:50 -03:00
gnembon dcac57a1a2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
2020-05-18 22:18:29 -03:00
gnembon 0a7b231a63 added add_chunk_ticket 2020-05-18 22:14:07 -03:00
gnembon 5ed5718b87 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-05-17 23:54:54 -03:00
gnembon 06ede1fbc0 added add_chunk_ticket 2020-05-17 23:52:59 -03:00