Commit Graph
82 Commits
Author SHA1 Message Date
gnembon 652ca7d6a0 spawning illegal entities with perimetercheck, fixes #194 2020-03-31 21:04:09 -03:00
gnembon 182eac89c9 too long player names, fixes #195 2020-03-31 20:53:10 -03:00
gnembon b041e05b47 removed inspector 2020-03-17 10:14:36 -03:00
gnembon 493cea2c13 added commandScriptACE setting and custom permissions for scarpet. 2020-03-11 02:39:39 -03:00
gnembon 5c9774f1d2 added feedback to event calling and fixed event registry
disabled ability to handle global events from player scoped apps
2020-02-25 01:29:21 -04:00
gnembon 161b5d491d added options for drop command 2020-02-09 01:56:30 -04:00
gnembon 85a34fdefa added profile command 2020-02-06 09:33:46 -04:00
gnembon fbd917b005 1.15.2-11 2020-02-03 12:06:40 -04:00
gnembon e04a8be9e8 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-02-03 10:58:17 -04:00
gnembon b4a50b8c3f mulitple counters in hud - not really needed but why not. 2020-02-02 00:03:38 -04:00
gnembon a50b00059e Merge branch 'master' into 1.15 2020-01-27 22:48:56 -04:00
gnembon 9430fcc052 handled better errors and stack traces for more (all) cases 2020-01-27 22:47:29 -04:00
gnembon 51cbe4ac01 Merge branch 'master' into 1.15 2020-01-25 01:23:06 -04:00
gnembon 82466158c2 indicate unused yet imports 2020-01-25 01:12:32 -04:00
gnembon 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -04:00
gnembon 1ea8815bd0 Merge branch 'master' into 1.15 2020-01-10 21:50:20 -04:00
gnembon e44cf0d79b action pack improvements 2020-01-10 21:48:55 -04:00
gnembon 01273548b2 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
2020-01-09 00:10:04 -04:00
gnembon f674936199 renamed main 2020-01-08 23:47:54 -04:00
gnembon 4f65be946c modules and imports 2020-01-08 23:38:31 -04:00
gnembon 8725b59241 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
#	src/main/java/carpet/helpers/EntityPlayerActionPack.java
2020-01-05 02:27:33 -04:00
gnembon 1650f3233b imports and better error reporting and stacktraces 2020-01-05 02:24:48 -04:00
gnembon 8f9dd66cdf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java
2019-12-10 23:14:04 -04:00
gnembon 55065a38a6 moved CarpetSettings up from settings manager, should be easier to find later. 2019-12-10 23:08:40 -04:00
gnembon d764543f51 1.15-pre5-2 2019-12-05 21:45:14 -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 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 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 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 835f63755d -> now returns function name. 2019-10-24 00:20:29 -03:00
gnembon 813cb2ab93 Merge branch 'master' into 1.15 2019-10-19 22:18:14 -03:00
gnembon 0226965ba0 fixed scarpet error msgs 2019-10-19 22:17:41 -03:00
gnembon 2bb9c8c145 Merge branch 'master' into 1.15 2019-10-15 09:38:35 -03:00
gnembon 6524725245 fixes to scarpet 1.5 2019-10-15 09:37:50 -03:00
gnembon dc9532cf05 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
2019-10-08 02:07:45 -03:00
gnembon 2167c929d5 two more events, and nbt cleanups 2019-10-06 22:06:38 -03:00
gnembon 23c3dc58a5 Merge branch 'master' into 1.15 2019-09-27 11:16:57 -05:00
gnembon 2f83cb3100 added option to display rules from category 2019-09-27 11:00:51 -05:00
gnembon 49f66a61ce Merge branch 'master' into 1.15 2019-09-21 17:03:36 -03:00
gnembon 70a2c57d20 better wording 2019-09-21 17:02:51 -03:00
gnembon 59f2c8f958 19w38b WIP 2019-09-18 16:25:08 -03:00
gnembon be82935455 Merge branch 'master' into 1.15 2019-09-17 14:22:03 -03:00
gnembon b89bb3e503 added rule autoloadScripts to load scripts at startup. 2019-09-17 14:21:36 -03:00
gnembon 179bc21223 115 changes 2019-08-23 06:58:32 +02:00
gnembon 8a01ebea41 profiler remembers requestee, and better rounding in scarpet 2019-08-23 06:04:13 +02:00
gnembon 8e369c2549 fix harvest 2019-07-21 16:55:30 -03:00
gnembon 34bfe2e996 host tweaks 2019-07-20 19:05:11 -03:00