Commit Graph
1423 Commits
Author SHA1 Message Date
gnembon 8925756bf4 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
2020-06-05 16:57:50 -03:00
gnembon 4dc8982009 refactor 2020-06-05 16:54:38 -03:00
gnembon a15da8c007 1.16-pre2 2020-06-05 13:48:15 -03:00
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 7936f774d5 loader 2020-06-05 00:13:09 -03:00
gnembon d8b4d8dcd4 small ver bump 2020-06-04 22:36:00 -03:00
gnembon 4e9a1aa39d mojang order of things 2020-06-04 22:35:03 -03:00
gnembon 6c01ae6807 1.16-pre1 2020-06-04 16:55:21 -03:00
gnembon 4528e7ac41 Merge branch 'master' into 1.16 2020-06-04 16:02:40 -03:00
gnembon 0f10e030dd Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-06-04 16:01:57 -03:00
gnembon ec8344626d 1.3.26 2020-06-04 16:01:41 -03:00
gnembon 0a924a3b5e 1.3.26 2020-06-04 16:01:29 -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 1a3d5aa223 Merge branch 'master' into 1.16 2020-06-04 12:54:30 -03:00
gnembon 1c3d017e01 keeping versions of connected clients 2020-06-04 12:52:36 -03:00
gnembon 8ff5484d3d Merge branch '1.16' of https://github.com/gnembon/fabric-carpet into 1.16 2020-06-04 02:43:17 -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 07b9a4daf2 Merge branch 'master' into 1.16 2020-06-03 23:03:27 -03:00
gnembon bd29eef3e8 tuning of shapes 2020-06-03 23:03:11 -03:00
gnembon be8b926d71 Merge branch 'master' into 1.16 2020-06-03 22:49:50 -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 d6845487ce changes in 1.16 require to re-register commands after datapack reload. May affect extensions with custom CMs - doubt there is any. 2020-06-02 21:05:44 -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 681d6ec9ee fixed overlay 2020-06-02 11:58:33 -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 7983917f71 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-06-01 21:10:52 -03:00
gnembon 01a2d9ea6e removed potential ConcurrentModificationException chance, part one for 304 2020-06-01 21:10:42 -03:00
whats2000 78e7d9618d Create zh_tw.json (#302)
* Create zh_tw.json

A traslate for traditonal Chinese

* Update zh_tw.json

Fixed some words is in wrong grammar

* Update CarpetSettings.java
2020-06-01 16:39:08 -03:00
gnembon 59be8b3fb4 redocced to draw_shape 2020-06-01 12:05:01 -03:00
gnembon 0d341a1362 overlay fixes 2020-06-01 03:27:34 -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