Commit Graph
745 Commits
Author SHA1 Message Date
gnembon 241537b172 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/resources/carpet.mixins.json
2021-06-22 01:28:32 -03:00
gnembon 00ab7c1601 flying in end gateways in cretiveNoClip won't teleport. fixes #943 2021-06-22 01:27:17 -03:00
gnembon 3a09e6b710 Merge branch '1.17' of https://github.com/gnembon/fabric-carpet into 1.17 2021-06-20 00:21:01 -03:00
gnembon 01aeb79617 Merge branch 'master' into 1.17 2021-06-20 00:15:45 -03:00
replaceitemandgnembon 4dd19ee4ea Made deepslate generate below y16 (#914)
* Made deepslate generate below y16

* Update src/main/java/carpet/CarpetSettings.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-06-19 12:45:01 -03:00
David Ludwig 85415463cd Re-implement fastRedstoneDust (#913) 2021-06-19 12:00:30 -03:00
gnembon 0937ba8352 1.17.1-pre1 2021-06-18 23:43:47 -03:00
gnembon a4cec8165b fixing scoreboard API 2021-06-17 21:34:36 -03:00
gnembon 3ff7e1d4cb Merge branch 'master' into 1.17 2021-06-17 21:20:53 -03:00
gnembon 3a83a94361 added despawn timer 2021-06-17 21:20:11 -03:00
gnembon 8093ac995d update 2021-06-13 11:49:01 -03:00
gnembon dc38cd272f Merge branch 'master' into 1.17
# Conflicts:
#	src/main/resources/carpet.mixins.json
2021-06-13 11:47:56 -03:00
gnembon 0f03e6e3bd creativeNoClip player are not affected by opening shulkers. Fixes #878 2021-06-11 03:15:17 -03:00
gnembon a48a7df386 added perf command support 2021-06-06 10:32:22 -03:00
gnembon 4ccae7abe0 1.17-pre3 2021-06-01 19:53:35 -03:00
gnembon 020dd6a8f4 movableAmethyst extension 2021-05-31 17:00:42 -03:00
hugeblankandhugeblank a3954d50f4 Add Movable Amethyst Rule (#894)
* Add Pushable Amethyst Rule

As discussed in #79 of ilmangos peaceful challenge. He said he'd do it, I figured I could beat him to the punch :)
https://youtu.be/0-fAKpr_J8k?t=1076

* Name change - movableAmethyst

Co-authored-by: hugeblank <hugeblank@gmail.com>
2021-05-31 16:15:16 -03:00
gnembon 38b2e83d05 fixed crash report for 1.17 2021-05-31 16:14:10 -03:00
gnembon 5f630e7d1a Merge branch 'master' into 1.17 2021-05-31 15:54:32 -03:00
altrisi d3c3c8e157 Add a crash report section for Scarpet apps (#892) 2021-05-31 15:53:00 -03:00
gnembon c55019d048 fixed broken movable TEs under Java 16 2021-05-31 15:40:44 -03:00
gnembon f64cf67e41 1.17-pre1 2021-05-27 15:01:07 -03:00
gnembon 7871727217 Merge branch 'master' into 1.17 2021-05-25 17:38:11 -03:00
Fx Morin 90c6af82d2 Added Rule updateSuppressionBlock (#877)
Pull Request for https://github.com/fxmorin/UpdateSuppressionBlock
2021-05-25 17:33:41 -03:00
gnembon b96a1b1216 Merge branch 'master' into 1.17 2021-05-25 17:25:55 -03:00
gnembon f18cc1c836 more thread safe carpet globs 2021-05-25 17:24:14 -03:00
gnembon 95d8c5fd90 Merge branch 'master' into 1.17 2021-05-22 22:14:43 -03:00
gnembon fb4c40c951 separated properly client disconnect from server shutdown allowing for retaining carpet settings till world is gone. Fixes #854 2021-05-22 22:14:16 -03:00
gnembon 84dd972758 Merge branch 'master' into 1.17 2021-05-21 04:42:21 -03:00
gnembon 7fd49e0f04 fix client methods in biome, fixes #870 2021-05-21 04:22:18 -03:00
gnembon b80b555781 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
#	src/main/java/carpet/utils/WoolTool.java
2021-05-18 21:23:15 -03:00
Ghoulboyandgnembon 7536edc2b9 Adding Javadocs to CounterCommand.java and relevant files (#838)
* adding class javadoc

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-05-17 19:32:57 -03:00
gnembon 727bdd7b1a 21w19a 2021-05-12 23:40:09 -03:00
gnembon dfa826bb24 21w18a 2021-05-05 20:34:59 -03:00
gnembon 5ac22aa000 mapping 2021-05-05 01:50:04 -03:00
gnembon b84478e7db 21w17a 2021-04-28 17:05:42 -03:00
gnembon 99e8db192a mappings 2021-04-28 01:42:49 -03:00
gnembon 988357317a Merge branch 'master' into 1.17 2021-04-26 23:29:27 -03:00
Ghoulboy 164122eba2 Adding query player language (#824) 2021-04-26 21:38:29 -03:00
gnembon e8ab5f0d50 Merge branch 'master' into 1.17 2021-04-25 00:50:22 -03:00
gnembon 33c0cc6979 damage can also be reported if its == 0. Might be useful 2021-04-25 00:50:06 -03:00
gnembon e8f135872d fixes #827 2021-04-22 08:41:27 -03:00
gnembon fc87053978 21w16a 2021-04-21 20:12:44 -03:00
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -03:00
gnembon 72a3d74a97 extremeBehaviours let wither spawn charged skulls at 10%, not 0.1% 2021-04-20 17:35:41 -03:00
gnembon 8870c245ff mapping 2021-04-20 00:09:00 -03:00
gnembon 587e04c8db 1.17 update 2021-04-17 01:56:37 -03:00
gnembon 8f2c935fe6 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/network/ClientNetworkHandler.java
#	src/main/resources/assets/carpet/scripts/ai_tracker.sc
2021-04-17 01:37:40 -03:00
gnembon 3e24c24648 silenced obtrusive log message with custom biomes. Fixes #810 2021-04-17 00:47:12 -03:00
gnembon d0fa948a46 Merge branch 'master' into 1.17 2021-04-16 13:02:12 -03:00