icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
659 Commits 1 Branch 0 Tags
cc9cc17b2702ec69a8fa236b5b853f18fcaeaa2d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gnembon cc9cc17b27 Merge branch 'master' into 1.15 2019-12-10 00:13:20 -04:00
gnembon 3dfd44538b 4 2 2019-12-10 00:11:12 -04:00
gnembon 18a0ad097b 1.15 - pre7 2019-12-09 10:37:38 -04:00
gnembon 442b802638 Merge branch 'master' into 1.15 2019-12-09 10:36:40 -04:00
gnembon 5b2d45f152 1.2.6 aka 1.3 pre-1 2019-12-09 10:34:32 -04:00
gnembon 5005271ea3 Merge branch 'master' into 1.15 2019-12-08 13:14:55 -04:00
gnembon 1984c2cc77 fixed profiler counting be time in e time 2019-12-08 13:14:31 -04:00
gnembon 04459094e6 1.15 mixin cleanup 2019-12-07 01:07:19 -04:00
gnembon 380b9131d8 added bee tree 2019-12-07 01:06:08 -04:00
gnembon 56ea9ac961 cleaning up fixed 1.15 features 2019-12-06 16:49:50 -04:00
gnembon 511919ae1b trying the beehive feature 2019-12-06 16:22:29 -04:00
gnembon 9df699746c fixed plop 1.15 changes 2019-12-06 15:47:13 -04:00
gnembon 3907a949a3 Merge branch 'master' into 1.15 2019-12-06 13:41:39 -04:00
gnembon 9cca6ddfb5 just to make sure string booleans are handled properly 2019-12-06 13:41:13 -04:00
gnembon 645f5db2bf block commands by default supports new extended boolean values 2019-12-06 12:47:52 -04:00
gnembon 20f8c0a965 Merge branch 'master' into 1.15 2019-12-06 12:24:34 -04:00
gnembon 656638c6dc continue and break scarpet functions to replace _exit_ conditions in loops 2019-12-06 12:24:13 -04:00
gnembon 7f49ee09ad continue and break scarpet functions to replace _exit_ conditions in loops 2019-12-06 12:22:27 -04:00
gnembon 3acf504d9d 1.15 pre6 2019-12-06 10:35:30 -04:00
gnembon d764543f51 1.15-pre5-2 2019-12-05 21:45:14 -04:00
gnembon 75dea94df2 removed client function call 2019-12-03 23:15:26 -04:00
gnembon 942b41ecc4 Merge branch 'master' into 1.15 2019-12-03 23:13:30 -04:00
gnembon 20d066c674 removed client function call 2019-12-03 23:13:10 -04:00
gnembon 7802037ab0 fix explosions yet again 2019-12-03 17:30:37 -04:00
gnembon f8fd213612 1.15 pre4 2019-12-03 16:57:01 -04:00
gnembon 28456fb289 1.15 pre4 2019-12-03 16:41:59 -04:00
gnembon 8cb2455eab Merge branch 'master' into 1.15 2019-12-03 16:41:03 -04:00
gnembon 355708609c 1.2.5+v191203 2019-12-03 16:36:02 -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 431080eea9 Merge branch 'master' into 1.15 2019-12-01 01:05:27 -04:00
gnembon b52b5c335f ops options for commands 2019-12-01 01:04:58 -04:00
gnembon c2f22a141a dispenser category 2019-11-30 19:45:07 -04:00
gnembon a0c3a83dfe 1.15-pre3+build.2 2019-11-30 01:34:30 -04:00
gnembon af153eb42d Merge branch 'master' into 1.15 2019-11-30 01:26:08 -04:00
gnembon 4736c6b4fd 1.2.5 prep 2019-11-30 01:25:02 -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 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 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