Commit Graph
623 Commits
Author SHA1 Message Date
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 5beef273a1 Merge branch 'master' into 1.15 2019-11-28 20:02:41 -04:00
gnembon 1c35f5b6a9 generalize set response, fixes #107 2019-11-28 20:01:28 -04:00
gnembon 1d10f7f1b1 1.15 pre3 2019-11-28 19:54:15 -04:00
gnembon 6497200dac 1.15 pre2 - 4 2019-11-28 11:43:55 -04:00
gnembon 9146556803 Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-28 11:20:54 -04:00
gnembon f6e01db616 loader 0.7.2 2019-11-28 11:14:12 -04:00
gnembon b88e0be365 Merge branch 'master' into 1.15 2019-11-27 22:08:01 -04:00
gnembon f3620ddafe settings search returns ordered results 2019-11-27 21:24:05 -04:00
gnembon 80fcdd3cbe settings search returns ordered results 2019-11-27 21:23:12 -04:00
gnembon e4520a0a11 1.15 change 2019-11-26 02:15:42 -04:00
gnembon fc9dcb6111 1.15 change 2019-11-26 02:10:01 -04:00
gnembon 6e97401ebb Merge branch 'master' into 1.15 2019-11-26 02:07:25 -04:00
gnembon 8b73d57a6b chunk_tickets_api 2019-11-26 02:05:48 -04:00
gnembon b14e02c8dd 1.15 pre2 2019-11-25 15:33:15 -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 6413c17657 cleanup undef 2019-11-22 00:23:50 -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 8ecaac80e2 1.15 pre1 2019-11-21 16:35:24 -04:00
gnembon 193b7a3e3a Merge branch 'master' into 1.15 2019-11-21 00:13:44 -04:00
gnembon 848f95cd30 new snapshot ETA 2019-11-21 00:13:20 -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 dbf48ea3bf Merge branch 'master' into 1.15 2019-11-20 01:23:59 -04:00
gnembon 18edddcade 1.2.4 2019-11-20 01:18:32 -04:00
gnembon f6eea46195 new loader 2019-11-20 01:16:46 -04:00
gnembon d2d3b2894e Merge branch 'master' into 1.15
# Conflicts:
#	src/main/resources/fabric.mod.json
2019-11-20 01:07:33 -04:00
gnembon 122533a7e0 new loader 2019-11-20 01:05:39 -04:00
gnembon 3e93929bc7 new loader 2019-11-20 01:04:50 -04:00
gnembon 2e1cfdda5d Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-20 01:03:04 -04:00
gnembon 7ef2f9c8ca new loader 2019-11-20 00:59:49 -04:00
gnembon df9280e8c2 Merge branch 'master' into 1.15 2019-11-19 22:56:30 -04:00
gnembon a9238b9918 docs 2019-11-19 22:53:26 -04:00
gnembon 909b183bda Merge branch 'master' into 1.15 2019-11-19 01:32:15 -04:00
gnembon 9e529fe967 Separate ScriptHost from CarpetScriptHost 2019-11-19 01:31:56 -04:00
gnembon 729399870e Merge branch 'master' into 1.15 2019-11-18 22:07:42 -04:00
gnembon bd61340e46 events are added on the fly as source loads 2019-11-18 16:06:35 -04:00
gnembon 12408cac75 Merge branch 'master' into 1.15 2019-11-18 01:17:37 -04:00
gnembon bf11cb7967 Merge pull request #103 from gnembon/proper_functions
Proper functions
2019-11-18 01:16:22 -04:00
gnembon 95b85928f9 refactored and reworked functions in scarpet 2019-11-18 00:56:50 -04:00
gnembon bb95c39b41 bee version 2019-11-14 23:26:49 -04:00
gnembon 57d1546fb3 Merge branch 'master' into 1.15 2019-11-14 23:21:45 -04:00
gnembon 3feb7bffbb midversion to support fixed profiler 2019-11-14 23:19:21 -04:00
gnembon 5e276c6115 tighten up profiler client support 2019-11-14 23:18:07 -04:00
gnembon 08a9e982e3 19w46a+build.2 2019-11-14 01:49:47 -04:00
gnembon bd59fe1254 Merge branch '1.15' of https://github.com/gnembon/fabric-carpet into 1.15
 Conflicts:
	gradle.properties
2019-11-14 01:42:01 -04:00
gnembon 308114b426 19w46a - no changes needed 2019-11-13 14:07:35 -04:00
gnembon 29fa86ca8a Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-13 14:03:52 -04:00