Commit Graph
309 Commits
Author SHA1 Message Date
gnembon 7fd49e0f04 fix client methods in biome, fixes #870 2021-05-21 04:22:18 -03:00
gnembon 4466c77780 small refactor, customizable appstore, minimize app calls. 2021-05-21 03:50:38 -03:00
gnembon 866f1f1497 moved downloader 2021-05-19 20:46:19 -03:00
gnembon b80b555781 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java
2021-05-18 21:23:15 -03:00
gnembon edc90133b2 fix run position, fixes #866 2021-05-18 21:18:53 -03:00
gnembon 31afc28401 Merge branch 'master' into 1.17 2021-04-24 01:13:57 -03:00
gnembon 28101e716b lists are now properly mutable 2021-04-24 01:13:33 -03:00
gnembon 4b85bdcb86 merge errors 2021-04-19 23:48:55 -03:00
gnembon 709d74ea47 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
2021-04-19 23:42:38 -03:00
gnembon ba89d0164f handling snooped commands properly 2021-04-19 23:40:22 -03:00
gnembon 5cceec9486 Merge branch 'master' into 1.17 2021-04-19 23:35:30 -03:00
gnembon b0dafccc18 re-name 2021-04-19 23:35:13 -03:00
gnembon 0d71d9c0a1 name 2021-04-19 09:35:01 -03:00
gnembon 400ed75b31 Merge branch 'master' into 1.17 2021-04-19 09:33:26 -03:00
gnembon 3915a5d889 fixed some run command behaviours. 2021-04-19 09:23:42 -03:00
gnembon 3df0e3f277 Merge branch 'master' into 1.17 2021-04-18 02:45:14 -03:00
altrisiandgnembon b7b7667484 Allow apps to specify mod version requirements (#798)
* Allow apps to specify mod version requirements

* Allow a function in requires field and move to `readConfig()`

* Add `server_mods` to system_info()

* Add prefixes and default to `=`

* Added docs for `requires` and for `system_info('server_mods')`

* Better docs for requires (mention * and available prefixes)

* Update docs/scarpet/api/Overview.md

* Update docs/scarpet/api/Overview.md

* Update docs/scarpet/api/Overview.md

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-18 02:36:29 -03:00
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 38285d4221 running functions will cause them not track the commandsource. fixes #815 2021-04-17 00:29:13 -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 6f13b9068e running execute store had no effect, fixes #809 2021-04-14 21:19:10 -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 92cc545896 less restricting use of shapes 2021-04-12 07:57:04 -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 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 27612905b8 added system_info world_spawn_point. Fixes #785 2021-04-04 17:54:05 -03:00
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