Commit Graph
1640 Commits
Author SHA1 Message Date
gnembon 359b89b46f Merge branch 'master' into 1.16 2020-07-21 05:07:22 -03:00
gnembon cfc97c5703 block breaking / active block entity API 2020-07-21 05:03:19 -03:00
gnembon 786e282889 player swaps hands event 2020-07-21 02:27:26 -03:00
Forgot-Dream 9d619f4797 update zh_cn.json and zh_tw.json (#385)
Translated by:Forgot-Dream and X-Green
Time:2020-7-18
2020-07-20 21:30:33 -03:00
gnembon e67ec14285 mappings 2020-07-20 21:06:03 -03:00
gnembon 0e8cf69539 Merge branch 'master' into 1.16 2020-07-20 03:00:00 -03:00
gnembon aa73514789 fix again 2020-07-20 02:59:44 -03:00
gnembon 182e5a7467 Merge branch 'master' into 1.16 2020-07-20 02:33:52 -03:00
gnembon 3968d3b3ee flickering shapes fix 2020-07-20 02:33:36 -03:00
gnembon 8fcd580238 Merge branch 'master' into 1.16 2020-07-19 22:48:06 -03:00
gnembon b1d0ce7521 lines were rendering through with the text 2020-07-19 22:47:57 -03:00
gnembon e8a357ca72 Merge branch 'master' into 1.16 2020-07-19 21:52:38 -03:00
gnembon 022c091fff attempt to solve hash collisions like vec3d(-8,8,-8)==vec3d(8,8,8) 2020-07-19 21:52:18 -03:00
gnembon 86b6723b6a Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-07-19 11:26:22 -03:00
gnembon ca0ddbb9e2 allow for discrete snapping of drawn shapes 2020-07-19 11:19:49 -03:00
gnembon 5ec6accbde Merge branch 'master' into 1.16 2020-07-19 03:29:01 -03:00
gnembon bd397ae772 docs for 1.16 brain API 2020-07-19 03:28:31 -03:00
gnembon 8833d33286 adjusting to 1.16 2020-07-19 02:57:14 -03:00
gnembon c22c7b991a adjusting to 1.16 2020-07-19 02:18:36 -03:00
gnembon 33651de9cd Merge branch 'master' into 1.16 2020-07-19 01:37:30 -03:00
gnembon 606f768aed added 'path' and 'brain' to entity query API 2020-07-19 01:37:19 -03:00
gnembon 96f36fc749 Merge branch 'master' into 1.16 2020-07-18 17:15:14 -03:00
gnembon 4958006bcc added doublesided 2020-07-18 17:15:00 -03:00
gnembon ca9f029996 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapeDispatcher.java
2020-07-18 17:03:20 -03:00
gnembon 02d985bafc added doublesided 2020-07-18 17:02:43 -03:00
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 3229e92950 Rework on structure API for 1.16.2 2020-07-12 22:15:39 -03:00