Commit Graph
319 Commits
Author SHA1 Message Date
gnembon d7ca974f1a statistics, block placed and interacted events, stats event test 2019-12-27 03:25:56 -04:00
gnembon 0b296cc05c update threads to 1.15.1 2019-12-25 03:33:25 -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 62529a352c camera update 2019-12-22 02:26:40 -04:00
gnembon 8c95aab2c6 scarpet thread safe pt1 2019-12-19 18:11:13 -04:00
gnembon ab3334e452 Merge branch 'threads' of https://github.com/gnembon/fabric-carpet into threads 2019-12-18 10:41:21 -04:00
gnembon 9457ce741c fixed te fillUpdates and client call fix. better camera 2019-12-18 10:41:03 -04:00
gnembon 2ff7988251 resolved joins from main thread as illegal 2019-12-17 14:41:47 -04:00
gnembon 3295ca2af9 Revert "threading testing"
This reverts commit 9ba573af
2019-12-17 11:59:23 -04:00
gnembon 9ba573afe6 threading testing 2019-12-17 10:28:14 -04:00
gnembon 5d32213922 threading 2019-12-16 08:56:22 -04:00
gnembon 1cf093731f extremeBenchmark 2019-12-13 18:04:47 -04:00
gnembon c4dfc1919e settled on positioning 2019-12-13 00:51:42 -04:00
gnembon de20c14da9 fixed 1.15 positioning 2019-12-12 23:32:58 -04:00
gnembon ada89c1f7e fixed 1.15 positioning 2019-12-13 02:50:11 -04:00
gnembon 25a51da4b8 relative position fail 2019-12-12 01:44:54 -04:00
gnembon 20f8c0a965 Merge branch 'master' into 1.15 2019-12-06 12:24:34 -04:00
gnembon 7f49ee09ad continue and break scarpet functions to replace _exit_ conditions in loops 2019-12-06 12:22:27 -04:00
gnembon c9160144fc Merge branch 'master' into 1.15 2019-12-01 09:39:25 -04:00
gnembon 9d6b652ad4 better block error message 2019-12-01 03:14:20 -04:00
gnembon bd5bd12e2a Merge branch 'master' into 1.15 2019-11-29 10:34:36 -04:00
gnembon afd7952a62 refactor entity events. Allow multiple hosts have events on things 2019-11-29 10:34:13 -04:00
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -04:00
gnembon aa8f5c1921 Merge branch 'master' into 1.15 2019-11-22 00:24:08 -04:00
gnembon 24c1ee8d3d lists and maps copy by reference. use copy to get a copy. 2019-11-21 21:21:58 -04:00
gnembon f5ffdb6eb9 Merge branch 'master' into 1.15 2019-11-20 23:37:36 -04:00
gnembon dd2630579b built-in variables can be used in outer scopes. 2019-11-20 23:37:16 -04:00
gnembon 12408cac75 Merge branch 'master' into 1.15 2019-11-18 01:17:37 -04:00
gnembon 95b85928f9 refactored and reworked functions in scarpet 2019-11-18 00:56:50 -04:00
gnembon 831fc06e0a Merge branch 'master' into 1.15 2019-11-12 00:58:30 -04:00
gnembon 33812fc88a despawn timer for living entities 2019-11-12 00:57:58 -04:00
gnembon d212fcb03d Merge branch 'master' into 1.15 2019-11-09 23:19:00 -04:00
gnembon bcff4fbbc4 clarify laziness of blocks and added more care to context execution 2019-11-09 23:12:05 -04:00
gnembon 829e0a7df5 Merge branch 'master' into 1.15 2019-11-08 22:47:29 -04:00
gnembon 6aa358c5fc calling block for a block future will resolve it. 2019-11-08 22:47:18 -04:00
gnembon 947e53d770 Merge branch 'master' into 1.15 2019-11-07 01:11:51 -04:00
gnembon efb87c8497 added copy and fixed cleaning of semicolons 2019-11-04 00:35:32 -04:00
gnembon 4f200671cf Merge branch 'master' into 1.15 2019-10-30 01:54:58 -03:00
gnembon 1706fd41a8 handle no arguments in modify 2019-10-30 01:54:21 -03:00
gnembon 0c5fd2f45c Merge branch 'master' into 1.15 2019-10-30 01:46:04 -03:00
gnembon c9715c89ae added noclip option for entities 2019-10-30 01:45:35 -03:00
gnembon 125a409813 Merge branch 'master' into 1.15 2019-10-29 00:47:10 -03:00
gnembon 6c2ddd68db fixed named results, and added loaded_status 2019-10-29 00:46:44 -03:00
gnembon b1cf5f4a09 Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-10-25 02:14:10 -03:00
gnembon 22134187d8 lousy semicolon support, replace, escape, and ai in entities 2019-10-24 23:03:19 -03:00
gnembon a3715f08a4 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/value/EntityValue.java
2019-10-24 00:53:40 -03:00
gnembon 19781b2a4d never star imports 2019-10-24 00:49:25 -03:00
gnembon 7f941e02f5 fixed position tracking 2019-10-23 14:02:04 -03:00
gnembon f41ae0f00e Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/TntEntityMixin.java
#	src/main/java/carpet/script/value/EntityValue.java
2019-10-23 08:58:57 -03:00