Commit Graph
232 Commits
Author SHA1 Message Date
gnembon 5dd2a12aa7 mapping 2021-04-02 18:38:55 -03:00
gnembon ab553187c5 its a doozie 2021-03-24 10:35:52 -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 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 7d135187b1 fixed shapes for 1.17 rendringo 2021-03-18 00:37:05 -03:00
gnembon 1bd6dcbf12 rework on shapes. Labels are showing up, but lines don't. 2021-03-16 15:31:58 -03:00
gnembon 42f78a596a 20w10a
- broken scarpet shapes
2021-03-10 23:13:59 -04:00
gnembon 5c4744a93b Merge branch 'master' into 1.17 2021-03-09 19:41:49 -04:00
gnembon 2d1b53258c simplify error messages 2021-03-09 13:29:20 -04:00
gnembon 25eccc9569 Merge branch 'master' into more-throwables 2021-03-07 17:52:10 -04:00
gnembon a82a9a60a3 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/EntityValue.java
2021-03-07 16:39:17 -04:00
gnembon 38458a8e35 added create_datapack, check_hidden_dimensions and world_dimensions in system info. 2021-03-07 16:37:13 -04:00
altrisi 86dabe0080 Add exception hierarchy 2021-02-21 00:57:37 +01:00
altrisi a155494d11 Allow some exceptions to be handled 2021-02-19 19:54:41 +01:00
gnembon 695d66da50 mapping 2021-02-17 13:18:57 -04:00
gnembon b14cf288a1 mappings 2021-01-15 04:51:06 -04:00
gnembon ed4afa15ff Merge branch 'master' into 1.17 2021-01-07 00:41:15 -04:00
gnembon eac4eb0537 Merge pull request #634 from altrisi/freeze-schedules
❄️ Freezing Scarpet ❄️
2021-01-07 00:00:48 -04:00
gnembon 4aaec6562b Merge pull request #643 from altrisi/json-reading
Reading/Writing JSON in Scarpet
2020-12-28 22:48:55 -04:00
Ghoulboy78 6375108dbf Add game_data_version (it's mostly for WE dev, ngl) 2020-12-28 10:28:20 +01:00
altrisi 929c17da36 Fix Value mess 2020-12-27 15:53:44 +01:00
altrisi aabff1623b Reading/Writing JSON, first working version 2020-12-27 02:04:19 +01:00
altrisi 33347baaf7 Freezing Scarpet
And the client
2020-12-21 00:14:20 +01:00
gnembon 32d0ba9694 20w51a 2020-12-16 19:06:09 -04:00
gnembon 947474e9e9 Merge branch 'master' into 1.17 2020-12-07 22:13:45 -04:00
Ghoulboy bf0b75ebff adding dev_environment (#615) 2020-12-07 08:39:04 -04:00
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