Commit Graph
296 Commits
Author SHA1 Message Date
gnembon b39dd6ea49 Merge branch 'master' into 1.17 2021-07-02 00:39:23 -03:00
gnembon 8dc1556790 1.4.42 2021-07-02 00:37:01 -03:00
gnembon 4f77327b6c Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/AppStoreManager.java
2021-06-30 13:33:10 -03:00
altrisi 8613ecf9d8 Fix creativeFlyDrag and creativeFlySpeed not loading from config (#969) 2021-06-30 12:29:59 -03:00
gnembon 9a4e15da48 mappings 2021-06-29 17:28:58 -03:00
gnembon 787eb3e41d Merge branch 'master' into 1.17 2021-06-29 17:09:03 -03:00
gnembon ea6d750a40 1.4.41 2021-06-29 17:08:39 -03:00
gnembon 6d76403433 updates 2021-06-22 01:32:53 -03:00
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 db12562d3d Merge branch 'master' into 1.17 2021-06-08 16:29:17 -03:00
gnembon d30af7a993 1.4.40 2021-06-08 16:28:11 -03:00
gnembon a48a7df386 added perf command support 2021-06-06 10:32:22 -03:00
gnembon c0caa798eb Merge branch 'master' into 1.17 2021-05-31 17:02:07 -03:00
gnembon 8d181823d4 1.4.39 2021-05-31 17:01:52 -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 3e02df9150 Merge branch 'master' into 1.17 2021-05-27 15:01:17 -03:00
gnembon 63901ebb0c 1.4.38 2021-05-27 14:30:36 -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 eb927f5e7c Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-05-25 17:24:29 -03:00
gnembon f18cc1c836 more thread safe carpet globs 2021-05-25 17:24:14 -03:00
Keuinandgnembon 0cb20e0795 Allow /player spawn spawn offline-mode player in online server; Code clean-up in /player spawn command (#872)
* Clean up code in PlayerCommand.spawn and EntityPlayerMPFake.createFake.

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

* Update src/main/java/carpet/commands/PlayerCommand.java

* Update src/main/java/carpet/patches/EntityPlayerMPFake.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-05-25 13:21:59 -03:00
gnembon 74cc9a39e1 Merge branch 'master' into 1.17 2021-05-21 14:14:18 -03:00
gnembon 79fb489ab7 renames 2021-05-21 14:13:50 -03:00
gnembon 84dd972758 Merge branch 'master' into 1.17 2021-05-21 04:42:21 -03:00
gnembon 4466c77780 small refactor, customizable appstore, minimize app calls. 2021-05-21 03:50:38 -03:00
gnembon f56b22be6a 1.4.37 2021-05-19 18:19:06 -03:00
gnembon 47d629bac2 Merge branch 'master' into 1.17 2021-05-19 15:30:42 -03:00
gnembon 7ed96e22f1 Merge branch 'master' into 1.17 2021-05-12 17:07:13 -03:00
gnembon a593f1cf14 1.4.36 2021-05-12 17:05:28 -03:00
gnembon 7780a3276d Merge branch 'master' into 1.17 2021-05-05 20:20:48 -03:00
gnembon 7063d542ff 1.4.35 2021-05-05 20:19:18 -03:00
gnembon 820c9b6489 Merge branch 'master' into 1.17 2021-05-05 01:31:00 -03:00
gnembon 8d97ab26a9 script compile time optimizations. 2021-05-05 00:25:31 -03:00
gnembon 624f9973c8 Merge branch 'master' into 1.17 2021-04-28 16:50:45 -03:00
gnembon f8c3de21d3 1.4.34 2021-04-28 16:48:46 -03:00
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -03:00
gnembon 8c9dabdbbc 1.4.33 2021-04-21 18:41:39 -03:00
gnembon 2612dff497 Merge branch 'master' into 1.17 2021-04-14 15:07:15 -03:00
gnembon 1a96737cff 1.4.32 2021-04-14 14:35:49 -03:00
replaceitemandgnembon c878ffd637 Added renewableDeepslate (#806)
* Added renewableDeepslate

* Check for stillness

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-13 10:44:49 -03:00
gnembon 8903865faa Merge branch 'master' into 1.17 2021-04-07 19:12:08 -03:00
gnembon e0eec1bb9c 1.4.31 2021-04-07 18:49:53 -03:00