Commit Graph
22 Commits
Author SHA1 Message Date
gnembon 10009a9381 upd 2020-06-07 02:09:16 -03:00
gnembon f29153c3d2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/CarpetSettings.java
#	src/main/java/carpet/script/CarpetScriptServer.java
#	src/main/java/carpet/script/bundled/Module.java
2020-06-07 01:59:15 -03:00
gnembon fb3a5cfa64 read_file, delete_file, and write_file
Deprecated some uses of load_app_data and store_app_data
2020-06-07 01:52:38 -03:00
gnembon c61429099a mappings 2020-06-04 15:59:46 -03:00
gnembon cf817c2e39 mappings 2020-05-21 14:23:04 -03:00
gnembon f2e9a9de91 20w17a 2020-04-22 17:00:31 -03:00
gnembon a757c6f88a Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/bundled/Module.java
2020-04-15 02:00:31 -03:00
gnembon 8dbf269fde added world_time and day_time. Add ability to store app data in shared space. as well as store in file hierarchies. Fixes #215 2020-04-15 01:58:46 -03:00
gnembon 76080f1a59 20w14a 2020-04-02 23:38:19 -03:00
gnembon d82ec46d30 Merge branch 'master' into 1.15 2020-01-09 00:54:10 -04:00
gnembon 9214c31352 added libraries 2020-01-09 00:53:36 -04:00
gnembon 01273548b2 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
2020-01-09 00:10:04 -04:00
gnembon 4f65be946c modules and imports 2020-01-08 23:38:31 -04:00
gnembon 8725b59241 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
#	src/main/java/carpet/helpers/EntityPlayerActionPack.java
2020-01-05 02:27:33 -04:00
gnembon 1650f3233b imports and better error reporting and stacktraces 2020-01-05 02:24:48 -04:00
gnembon 3e6f83905c Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2019-12-25 03:18:15 -04:00
gnembon a4e6e7cb10 camera update and task clearing 2019-12-25 02:44:14 -04:00
gnembon e43c693411 fixes in 1.15 2019-10-13 03:05:27 -03:00
gnembon 701a717135 reworked container access (never throw, multi-field access, return values, operator), added package storage 2019-10-13 02:54:18 -03:00
gnembon fc66ec9c93 build in script load from resources, added 2 more events, added event test 2019-10-11 02:23:45 -03:00
gnembon 9b31fa0252 updated camera package 2019-05-16 22:31:55 -03:00
gnembon 885f579d6c scarpet v1.2 2019-05-16 14:11:39 -03:00