Commit Graph
1374 Commits
Author SHA1 Message Date
gnembon ab0bc6f221 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2020-05-31 14:41:12 -03:00
gnembon 46536664c1 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-05-31 14:30:08 -03:00
gnembon b29896858e much better, fixes #301 2020-05-31 14:29:51 -03:00
Forgot-Dream ec6cb9fa7a update zh_cn.json and fix bugs in extra-finding process(by X-Green) (#300)
* Add files via upload

* fix extra-finding (by X-Green)

* update zh_cn
2020-05-31 03:21:03 -03:00
gnembon 0b22359f8c mappings 2020-05-31 03:18:40 -03:00
gnembon 1c46393c4d Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-31 02:54:14 -03:00
gnembon ac1399c9c2 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-05-31 01:59:23 -03:00
gnembon 47452b5b12 added marker lines and boxes with client synchro fixes. 2020-05-31 01:57:04 -03:00
gnembon f6fb8e5899 ++ got eaten 2020-05-31 01:06:41 -03:00
gnembon 7c0a377d71 shapes renderer WIP 2020-05-29 14:06:32 -03:00
gnembon cfe1b7d837 docs on time 2020-05-29 14:05:37 -03:00
gnembon 3b588e8488 20w22a 2020-05-29 12:15:51 -03:00
gnembon cf18aa3fcf mod compat 2020-05-28 09:40:50 -03:00
gnembon e540f9e238 carpet client synchronizations and protocols 2020-05-28 00:06:28 -03:00
DeadlyMC 2522884da3 Client-server syncing (#295)
* Sync carpet settings

* Sync tick rate
2020-05-27 16:23:52 -03:00
gnembon 61524b1486 Merge branch 'master' into 1.16 2020-05-27 09:30:15 -03:00
gnembon 6747bb6001 1.3.25 2020-05-27 09:28:14 -03:00
gnembon 70350d7dca bye bye to /c /s due to F3F4 and change in F3+N to mimic exactly /c /s usecase 2020-05-27 02:05:46 -03:00
gnembon cb87b04b44 bye bye to /c /s due to F3F4 and change in F3+N to mimic exactly /c /s usecase 2020-05-27 02:05:05 -03:00
gnembon cd1e9d7264 Merge branch 'master' into 1.16 2020-05-27 00:53:49 -03:00
gnembon a1200d4c37 fixed so modify(..,'effect',...) does what docs say. 2020-05-27 00:53:21 -03:00
gnembon 243c3290ae mappings 2020-05-27 00:46:44 -03:00
gnembon 571a77ce64 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-05-26 14:44:50 -03:00
gnembon 2c777ea3ad fix client crash when accessing messenger 2020-05-26 14:44:06 -03:00
gnembon a4ac4cb01b Merge branch 'master' into 1.16
# Conflicts:
#	src/main/resources/carpet.mixins.json
2020-05-25 23:51:06 -03:00
gnembon 6618afa5ed clean log when placing structures and features 2020-05-25 23:50:28 -03:00
gnembon 1fd41511c3 Merge branch 'master' into 1.16 2020-05-25 02:00:23 -03:00
gnembon 64310ed84b fixed timings, fixes #291 2020-05-25 01:59:56 -03:00
gnembon 1940ca7f38 Merge branch 'master' into 1.16 2020-05-22 01:20:58 -03:00
gnembon e7170ddef9 added translation support for extensions 2020-05-22 01:19:08 -03:00
gnembon cf817c2e39 mappings 2020-05-21 14:23:04 -03:00
gnembon 42ba5a9f03 Merge branch 'master' into 1.16 2020-05-21 03:08:25 -03:00
gnembon 706ddb546a 1.3.24 2020-05-21 03:07:08 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03:00
gnembon 838211edba Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/BlockInfo.java
2020-05-20 10:41:04 -03:00
gnembon 864c9450f7 renamed vine to vegetation and redstone_bits to decoration 2020-05-20 10:40:01 -03:00
gnembon b51078e427 mappings 2020-05-20 10:31:06 -03:00
gnembon abd5f178be Merge branch 'master' into 1.16 2020-05-20 02:13:37 -03:00
gnembon 934038828c handled errors in server docked tasks to continue stack trace of internal exceptions. 2020-05-20 02:13:12 -03:00
gnembon ab86fc9292 added 'portal_cooldown' and 'portal_timer' to entity API (query and modify) 2020-05-20 02:09:57 -03:00
gnembon 208c066da1 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-05-19 18:18:27 -03:00
gnembon 66c222a77a poi results now come out sorted by distance 2020-05-19 18:17:50 -03:00
gnembon cbeb75c8ed fix 2020-05-18 23:02:49 -03:00
gnembon dcac57a1a2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
2020-05-18 22:18:29 -03:00
gnembon 7d1385b7cc Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-05-18 22:14:26 -03:00
gnembon 0a7b231a63 added add_chunk_ticket 2020-05-18 22:14:07 -03:00
GhoulboyandGhoulboy78 a272725928 Cylinders n cuboids (#284)
Co-authored-by: Ghoulboy78 <53367549+Ghoulboy-78@users.noreply.github.com>
2020-05-18 17:24:19 -03:00
gnembon 5ed5718b87 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-05-17 23:54:54 -03:00
gnembon 06ede1fbc0 added add_chunk_ticket 2020-05-17 23:52:59 -03:00
gnembon aabfda3797 Merge branch 'master' into 1.16 2020-05-15 20:00:55 -03:00