Commit Graph
1490 Commits
Author SHA1 Message Date
gnembon e38fb896c2 fix label text to work with 1.16 2020-07-18 14:16:53 -03:00
gnembon eb79ea98e7 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-07-18 13:21:33 -03:00
gnembon 57b5bace32 added label to displayed shapes 2020-07-18 13:20:49 -03:00
gnembon 803f99e8f0 task types are reported properly. 2020-07-16 01:13:24 -03:00
gnembon 8a07c96d45 Merge branch 'master' into 1.16 2020-07-15 16:40:35 -03:00
gnembon a575de5076 20w29a 2020-07-15 16:40:28 -03:00
gnembon c728fcb8cc 1.4.3 2020-07-15 15:36:09 -03:00
gnembon 6fad107c6b restored timer on the villager 2020-07-15 15:15:16 -03:00
gnembon 3b90bd5d3a mappings 2020-07-15 04:35:15 -03:00
gnembon b6543ff8dd Merge branch 'master' into 1.16 2020-07-15 03:43:26 -03:00
gnembon 52e54c0a47 nbt values retain their string representation forever. 2020-07-15 03:43:06 -03:00
gnembon f500da08a0 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java
2020-07-15 01:21:02 -03:00
gnembon e8d6e16745 breaking block event is called just before any changes to the world are made. 2020-07-15 01:17:33 -03:00
gnembon a345788358 Action for finishing using item is triggered just before vanilla applies its effects. 2020-07-15 00:40:54 -03:00
gnembon f397a59579 fixed so updating of slot and craft requests are only called from main thread. 2020-07-15 00:25:51 -03:00
gnembon f871a5d473 move damage events before damage effects are applied 2020-07-14 23:36:11 -03:00
gnembon 39a85976fd Merge branch 'master' into 1.16 2020-07-14 00:05:35 -03:00
gnembon ce19dbe505 entity events will execute as that entity 2020-07-14 00:04:38 -03:00
gnembon 0e21942df7 Merge branch 'master' into 1.16 2020-07-13 00:41:34 -03:00
gnembon e2f48d6d16 1.4.2 2020-07-13 00:40:33 -03:00
gnembon d90b4a306a specified interactive option for markers, fixes #372 2020-07-13 00:22:15 -03:00
gnembon 5f34b5c96c Easier for extensions to add their own built-in apps 2020-07-12 23:00:05 -03:00
gnembon 3140a4fe53 Callback for extensions to contribute information to HUD loggers. 2020-07-12 22:34:10 -03:00
Fallen_Breath 4b8219281b HUD logger hook for carpet extensions (#370)
* qc激活->半连接激活

* Update zh_cn.json

* ui.rule_%(rule)s_not_set_restart

* added quotation marks to rule translation display

* added extension HUD logger hook
2020-07-12 22:23:48 -03:00
gnembon 351cc9bb2e feature registry help 2020-07-12 16:18:37 -03:00
gnembon a0e0dc0f88 20w28a. Rewritten scarpet structure and plop API. Removed portalSuffocationFix, as its fixed. 2020-07-12 02:38:12 -03:00
gnembon bba9f4e88d Merge branch 'master' into 1.16 2020-07-08 00:48:56 -03:00
gnembon 72ffc5b8b9 defined addition for maps prioritizing set operations. 2020-07-08 00:48:29 -03:00
gnembon 52d4a9d581 adjustment to piglins respawning in bastions. 2020-07-06 00:14:09 -03:00
Hunter Kvalevog 1f1c5de303 Add "/player look at" subcommand 2020-07-04 06:02:24 -05:00
eatmyvenom 753d262f6e Add the rule bruteSpawningInBationRemnants 2020-07-02 22:35:26 -07:00
gnembon 03061ba114 20w27a 2020-07-01 15:41:25 -03:00
gnembon 150c1d41a7 renewableBlackstone 2020-07-01 15:07:17 -03:00
gnembon c69f65e68e Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-07-01 14:54:04 -03:00
gnembon 41258e8494 1.4.1 2020-07-01 14:51:00 -03:00
gnembon 926375700a docs on reset_chunks 2020-07-01 14:49:22 -03:00
gnembon 731b78cf9d update 2020-07-01 02:13:43 -03:00
gnembon af35504016 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
2020-07-01 01:54:39 -03:00
gnembon a7a37a3975 cleanup 2020-07-01 01:47:04 -03:00
gnembon 7067e59a21 Merge branch 'master' into light
# Conflicts:
#	src/main/resources/carpet.accesswidener
#	src/main/resources/fabric.mod.json
2020-07-01 00:11:35 -03:00
gnembon 51313d496e Merge branch 'master' into 1.16 2020-06-29 12:26:14 -03:00
gnembon 9b439270f1 added persistence to entity API (read and write) 2020-06-29 12:25:12 -03:00
gnembon b2ff11b9e5 Merge branch 'master' into 1.16 2020-06-28 23:04:33 -03:00
gnembon b9daf50236 added {} and [] notations, added new function of -> operator and retired element() 2020-06-28 23:04:14 -03:00
PhiPro95 0c1dba0157 Rewrite regenerateChunkRegion 2020-06-29 01:03:26 +02:00
gnembon 66a02c06cd Merge branch 'master' into 1.16 2020-06-28 14:34:35 -03:00
gnembon 391c7b976e without_updates and in_dimension are now properly synchronized. 2020-06-28 14:25:19 -03:00
gnembon 9daf154a34 1.16.1 2020-06-24 22:15:13 -03:00
gnembon 6e24dce8cd Merge branch 'master' into 1.16 2020-06-23 19:43:19 -03:00
gnembon 6930b58691 fixing handling comments 2020-06-23 19:42:40 -03:00