Commit Graph
152 Commits
Author SHA1 Message Date
gnembon 89e61db56e Merge branch 'master' into 1.17 2020-12-06 20:36:40 -04:00
Ghoulboy 49e5c012b3 Adding Gamerule modification to scarpet (#610) 2020-12-06 20:32:29 -04:00
gnembon 4a67668c8c proper mocked command source. Fixes #608 2020-12-05 01:58:27 -04:00
gnembon 9d08c54324 Merge branch 'master' into 1.17 2020-12-03 22:25:51 -04:00
gnembon 259bdc2c94 ability to query client brand and server scarpet version. 2020-12-02 22:36:20 -04:00
gnembon 2552887340 Merge branch 'master' into 1.17 2020-11-28 19:03:39 -04:00
gnembon 5a8ce26c44 'biome' query api 2020-11-28 19:02:58 -04:00
gnembon 4f7ebdd9ff Merge branch 'master' into 1.17 2020-11-28 12:13:07 -04:00
gnembon 54d306d9bc added biome query to biome 2020-11-28 12:11:31 -04:00
gnembon f4f289b0ec Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/value/NBTSerializableValue.java
2020-11-26 03:03:03 -04:00
gnembon 79cb4a20d8 refactor for inventories, allowing for null types. 2020-11-26 00:33:09 -04:00
gnembon 2d92a82ed0 simpler 2020-11-25 22:31:47 -04:00
gnembon ba58a99c21 Merge branch 'master' into 1.17 2020-11-25 17:53:00 -04:00
gnembon 201654ff44 adding support for equipment inventories as well as horse and pillager item inventories. 2020-11-25 17:52:17 -04:00
gnembon d48896ad8b mappings. More colors and materials 2020-11-06 23:10:43 -04:00
gnembon 2cdea92da7 20w45a 2020-11-06 00:06:53 -04:00
altrisi b9eee6e58b Allow rules to manage Scarpet apps (Scarpet Rules) (#519)
by altrisi
2020-11-02 21:52:21 -04:00
gnembon 239aa9e143 added system_info, deprecated seed 2020-10-12 23:01:44 -03:00
gnembon 33f400e904 refactor 2020-09-09 16:19:12 -03:00
gnembon 59575ec607 refactor breaking up API and language defs 2020-09-09 15:37:03 -03:00
gnembon a9572236dd custom dims wip 2020-09-07 14:31:47 -03:00
gnembon 598219608b added WIP 'custom_dimension' to the API 2020-08-17 00:36:01 -03:00
gnembon ba56fc7bd7 mapping 2020-08-04 12:48:03 -03:00
gnembon 7f8735021f Merge branch 'master' into 1.16 2020-07-28 20:05:07 -03:00
gnembon bca31c6b22 adjusted label positioning 2020-07-28 00:52:49 -03:00
gnembon 16033dfa1a Merge branch 'master' into 1.16 2020-07-28 00:09:22 -03:00
gnembon 7a1e05cfa1 tweaked line particle display and chunk display app 2020-07-27 22:10:13 -03:00
gnembon 4f4841b0f2 update 2020-07-27 04:50:43 -03:00
gnembon b4581ca0c8 Merge branch 'master' into 1.16 2020-07-27 04:43:09 -03:00
gnembon a7a5a82c35 fixed value not updating for labels 2020-07-27 04:40:53 -03:00
gnembon 4fe6a8d80f 20w30a 2020-07-22 17:15:26 -03:00
gnembon e67ec14285 mappings 2020-07-20 21:06:03 -03:00
gnembon 0e8cf69539 Merge branch 'master' into 1.16 2020-07-20 03:00:00 -03:00
gnembon aa73514789 fix again 2020-07-20 02:59:44 -03:00
gnembon 182e5a7467 Merge branch 'master' into 1.16 2020-07-20 02:33:52 -03:00
gnembon 3968d3b3ee flickering shapes fix 2020-07-20 02:33:36 -03:00
gnembon 8fcd580238 Merge branch 'master' into 1.16 2020-07-19 22:48:06 -03:00
gnembon b1d0ce7521 lines were rendering through with the text 2020-07-19 22:47:57 -03:00
gnembon e8a357ca72 Merge branch 'master' into 1.16 2020-07-19 21:52:38 -03:00
gnembon 022c091fff attempt to solve hash collisions like vec3d(-8,8,-8)==vec3d(8,8,8) 2020-07-19 21:52:18 -03:00
gnembon 86b6723b6a Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-07-19 11:26:22 -03:00
gnembon ca0ddbb9e2 allow for discrete snapping of drawn shapes 2020-07-19 11:19:49 -03:00
gnembon ca9f029996 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-07-18 17:03:20 -03:00
gnembon 02d985bafc added doublesided 2020-07-18 17:02:43 -03:00
gnembon e38fb896c2 fix label text to work with 1.16 2020-07-18 14:16:53 -03:00
gnembon eb79ea98e7 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-07-18 13:21:33 -03:00
gnembon 57b5bace32 added label to displayed shapes 2020-07-18 13:20:49 -03:00
gnembon 150c1d41a7 renewableBlackstone 2020-07-01 15:07:17 -03:00
gnembon 3700377686 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
#	src/main/java/carpet/script/value/BlockValue.java
2020-06-20 09:03:20 -03:00
gnembon d838cfd32f there can be more than 3 dimensions 2020-06-20 09:01:49 -03:00