Commit Graph
606 Commits
Author SHA1 Message Date
gnembon b64427a4ac Merge branch 'master' into future
# Conflicts:
#	src/main/resources/fabric.mod.json
2021-11-16 20:14:38 +01:00
gnembon 3eae059ee0 one more java 2021-11-16 20:13:08 +01:00
gnembon 5a6fc19bb0 1.18-pre1 2021-11-11 22:49:26 +01:00
gnembon 1642976d0d 21w44a 2021-11-04 00:34:40 +01:00
gnembon 31a6bd21df Merge branch 'master' into future 2021-10-20 23:24:52 -03:00
Fx Morin 0714098347 Ported rule updateSuppressionCrashFix from Carpet-Extra + More (#1133)
* Posted rule `updateSuppressionCrashFix` from Carpet-Extra
Also added catch for update suppression in neighbour update during ServerPlayerEntity tick.
Added Logger `updateSuppressedCrashes` so not everyone sees the crash messages
Added Coords to crash message so we now know where it originates from

* Make it easier to read

* that `s` has been there for a long time

* Made `updateSuppressionCrashFix` compatible with carpet-extra
2021-10-20 23:08:23 -03:00
gnembon 6a03675b4f Merge branch 'master' into future 2021-10-12 23:24:41 -03:00
gnembon 5b80c845c6 added liquidDamageDisabled inspired by TIS additions and ported by permission by Fallen Breath 2021-10-12 22:57:47 -03:00
gnembon bc175509a2 21w37a 2021-09-18 08:46:27 -03:00
gnembon 70754dbfe8 Merge branch 'master' into future
# Conflicts:
#	gradle.properties
2021-09-17 03:15:30 -03:00
gnembon 86d89aab20 added death messages control to cleanLogs (require showDeathMessages to be false as well). Fixes #1095 2021-09-08 21:13:17 -03:00
gnembon 77aa52dc0e 1.18 exp 3. Changes to custom mobcap. 2021-08-11 17:04:56 -03:00
gnembon 783f3f49f0 Merge branch 'master' into future 2021-08-11 15:02:51 -03:00
gnembon 16f3832d16 Fixes inventory behaviour with stackable empty shulker boxes. fixes #1048 2021-08-08 23:08:14 -03:00
gnembon 6594c2c07f Merge branch 'master' into future 2021-08-08 21:51:42 -03:00
Mitchell Skaggs 28cb136c6b Max collisions optimization (#1038)
* Lift entity limit up to the `getOtherEntities` method so it bails early

This has the potential to prevent a lot of bounding box computation

* Clean up decompiled code

* Fix raw generic types

This doesn't alter the signature, but it helps the compiler warn about misuse of the type later on

* Actually abort forEach when `limit` entities have been checked

`throw`ing a known exception is the easiest way to `break` out of a forEach call
2021-08-03 07:20:09 -03:00
HED-GITandgnembon 56a15fb384 added more customizability to renewableCoral (#1022)
* added more customizability to renewableCoral

* changed renewableCoral to use enums instead of strings

* added suggested changes to renewablecoralmode

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

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-07-29 23:48:04 -03:00
altrisi 2a391962ff Remove no longer needed Mixins (#1030) 2021-07-26 09:20:01 -03:00
gnembon 9cdc297314 1.18 exp1 2021-07-14 01:07:19 -03:00
gnembon 3affa8d5c8 shulker stacks can now be moved in 1.17, fixes #976 2021-07-05 16:28:59 -03:00
gnembon ca59c8f30a reloading chunks is not needed when resetting, fixing entities removed. 2021-06-29 02:21:47 -03:00
gnembon b8082ba5b8 Merge branch 'master' into 1.17 2021-06-29 02:07:39 -03:00
replaceitem 83afa95d98 Fixed team color using client method (#965) 2021-06-28 22:52:40 -03:00
gnembon 481fc97545 changes to entity load handler / not backwards compatible 2021-06-25 18:38:49 -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 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 c7b059fdb8 update 2021-06-13 11:50:18 -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
altrisi 1a92531554 Compact fabric initialization code (#918) 2021-06-12 23:02:33 -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 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 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 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 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
gnembon f32b8e4050 semicolon fixes #863 2021-05-18 01:06:55 -03:00
gnembon 727bdd7b1a 21w19a 2021-05-12 23:40:09 -03:00
gnembon 1a7acd519e Merge branch 'master' into 1.17 2021-05-07 23:50:44 -03:00
gnembon 36b469f309 added drowning 2021-05-07 23:31:45 -03:00
gnembon 820c9b6489 Merge branch 'master' into 1.17 2021-05-05 01:31:00 -03:00
whats2000 c465976609 Update zh_tw.json
small fix
2021-05-02 23:35:23 +08:00
whats2000 6eee47ec14 Update zh_tw.json
Add new translation to support the latest version
2021-05-02 23:22:44 +08:00
gnembon 988357317a Merge branch 'master' into 1.17 2021-04-26 23:29:27 -03:00