Commit Graph
636 Commits
Author SHA1 Message Date
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