Commit Graph
100 Commits
Author SHA1 Message Date
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 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
gnembon 12e6ef627f 1.2.3 2019-11-13 14:01:29 -04:00
gnembon e89e140536 Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-11-12 22:13:30 -04:00
gnembon fd5e53ec42 169 2019-11-12 22:12:37 -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 1861381951 oupsie 2019-11-10 20:49:31 -04:00
gnembon 0021aa4a20 19w45b 2019-11-09 23:51:53 -04:00
gnembon d212fcb03d Merge branch 'master' into 1.15 2019-11-09 23:19:00 -04:00
gnembon f61976f039 ctrlQ crafting will not craft other items if items not match up. 2019-11-09 23:18:19 -04:00
gnembon bcff4fbbc4 clarify laziness of blocks and added more care to context execution 2019-11-09 23:12:05 -04:00
gnembon 7bcdd0ab72 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2019-11-09 13:11:43 -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 4cc0412fe2 Merge branch 'master' into 1.15 2019-11-08 04:07:28 -04:00
gnembon f30459bd22 fixed docs 2019-11-08 04:03:39 -04:00
gnembon 223c5059be v191108 2019-11-08 02:50:03 -04:00
gnembon 336b1070a3 disable kelpGenerationGrowthlimit because its fixes the same way in core 2019-11-08 02:46:51 -04:00
gnembon ec19e37a74 19w45a 2019-11-07 16:13:15 -04:00
gnembon 6dd31329b7 Merge branch 'master' into 1.15 2019-11-07 14:29:26 -04:00
gnembon c855955179 1.2.2 2019-11-07 14:27:25 -04:00
gnembon 4f0389fa7e 115 2019-11-07 07:59:28 -04:00
gnembon 718fb38d7d Merge branch 'master' into 1.15 2019-11-07 07:59:05 -04:00
gnembon 24d4159f9f Merge branch 'dummy_enchants' into 1.15 2019-11-07 07:58:32 -04:00
gnembon 4997fa5a44 added optional force bool 2019-11-07 07:58:17 -04:00
gnembon 947e53d770 Merge branch 'master' into 1.15 2019-11-07 01:11:51 -04:00
gnembon ba2d654cec added generation status 2019-11-07 01:11:04 -04:00
gnembon ecf3f24c28 function definition now borrows variables from the defined context, not used context - so much more useful. 2019-11-04 01:16:24 -04:00
gnembon efb87c8497 added copy and fixed cleaning of semicolons 2019-11-04 00:35:32 -04:00
gnembon ff8dc630c5 19w44a 2019-10-30 13:38:51 -03:00
gnembon 99f6b4580d Merge branch 'master' into 1.15 2019-10-30 13:24:03 -03:00
gnembon e2c614c6de ver 1.2.1 2019-10-30 13:18:41 -03: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 fa3b119857 Merge branch 'master' into 1.15 2019-10-30 01:24:20 -03:00
gnembon 5bb959a853 falling blocks can also tick 2019-10-30 01:23:52 -03:00
gnembon 36e5e31d06 updated to .5 fabric 2019-10-29 01:32:39 -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 b1e2b4367d Merge branch 'master' into 1.15 2019-10-28 21:55:49 -03:00
gnembon 9315bc09dd simplified string parsing. 2019-10-28 21:55:27 -03:00
gnembon 144f3a2ad8 fix stackable shulkerboxes ignoring other tags 2019-10-28 21:39:32 -03:00
gnembon 98036e51a6 should technically be little faster 2019-10-25 23:06:51 -03:00
gnembon 23b9b4191b Merge branch 'master' into 1.15 2019-10-25 22:46:24 -03:00
gnembon f6360d3022 scarpet docs 2019-10-25 22:45:55 -03:00
gnembon f35516443b docs 2019-10-25 17:31:25 -03:00
gnembon ccbf6d85eb Merge branch 'master' into 1.15 2019-10-25 01:09:53 -03:00
gnembon b1cf5f4a09 Merge branch 'master' into 1.15
# Conflicts:
#	gradle.properties
2019-10-25 02:14:10 -03:00
gnembon bd52f6126a hires logo 2019-10-25 00:39:15 -03:00
gnembon 22134187d8 lousy semicolon support, replace, escape, and ai in entities 2019-10-24 23:03:19 -03:00
gnembon 4701fb5067 Merge branch 'master' into 1.15 2019-10-24 08:41:45 -03:00
gnembon 51a95a241c added lambda support 2019-10-24 08:41:20 -03:00
gnembon 810499f5d0 HUGE change 2019-10-24 08:10:08 -03:00
gnembon 6733aea207 Merge branch 'master' into 1.15 2019-10-24 00:59:12 -03:00
gnembon fdc0d74ad9 inch forward dev deploy 2019-10-24 00:57:52 -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 835f63755d -> now returns function name. 2019-10-24 00:20:29 -03:00
gnembon 7f941e02f5 fixed position tracking 2019-10-23 14:02:04 -03:00
gnembon 57c21364c6 Merge branch 'master' into 1.15 2019-10-23 09:09:44 -03:00
gnembon f0bb5d2e86 fixed settings 2019-10-23 09:08:30 -03:00
gnembon a5955358bb fixes to 1.15 for tnt 2019-10-23 09:05:41 -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
gnembon 1226a940e9 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2019-10-23 08:50:03 -03:00
gnembon e21cbf5f59 remove markers when app unloads or not loaded 2019-10-23 08:49:58 -03:00
gnembon 2d7bfb25b3 renamed mixin trying to prevent colliding in the future 2019-10-22 20:31:52 -03:00