icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,939 Commits 1 Branch 0 Tags
fc4c72151040a3b0e5ea7bb3db1e90dc53eb2b51
Commit Graph
326 Commits
Author SHA1 Message Date
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
gnembon 3756ca9f86 Merge branch 'master' into 1.17 2021-03-31 22:04:24 -03:00
gnembon 470821524d 1.4.30 foreal 2021-03-31 22:03:09 -03:00
gnembon 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon e795a38b17 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
 2021-03-18 00:52:13 -03:00
gnembon 3156094719 1.4.30 2021-03-17 19:00:11 -03:00
gnembon a499c3cd68 Merge branch 'master' into 1.17 2021-03-10 23:16:36 -04:00
gnembon 4e168626dd 1.4.29 2021-03-10 23:15:03 -04:00
gnembon 5c4744a93b Merge branch 'master' into 1.17 2021-03-09 19:41:49 -04:00
altrisi b123899abd Fix run() with a locked SettingsManager (#755) 
* Fix run() in locked SettingsManager

* Fix small security issue while I'm at it

* Notify command change
 2021-03-07 17:14:35 -04:00
gnembon 34bfe32e39 Merge branch 'master' into 1.17 2021-03-02 08:48:46 -04:00
Andrew S 69a0eeed7d Add pingPlayerListLimit setting (#704) 
* Update CarpetSettings.java

* Add pingPlayerListLimit

* Fix formatting & fail softer
 2021-03-01 22:48:31 -04:00
gnembon 659c3ffa6e Merge branch 'master' into 1.17 2021-02-24 18:30:58 -04:00
gnembon 3c8d875bd0 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-02-24 18:28:57 -04:00
gnembon 9fc67bb026 Merge branch 'master' into 1.17 2021-02-24 18:27:43 -04:00
gnembon 841b3f5491 1.4.28 2021-02-24 18:27:31 -04:00
gnembon 3505138351 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/CarpetSettings.java
 2021-02-24 20:41:06 -04:00
DragonEggBedrockBreakingandaltrisi eeddf96abc Update CarpetSettings.java 
Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
 2021-02-21 17:34:50 +00:00
DragonEggBedrockBreaking f7aa874ae8 Update CarpetSettings.java 2021-02-21 12:44:02 +00:00
gnembon 7029c6b9b9 Merge pull request #722 from fxmorin/master 
Added Rule `lightningKillsDrops`
 2021-02-18 22:17:37 -04:00
gnembon b61d69c904 Update src/main/java/carpet/CarpetSettings.java 2021-02-18 22:15:59 -04:00