Commit Graph

8101 Commits

Author SHA1 Message Date
okx-code
4dc1e9f346 fix fakeplayer 2024-10-09 01:37:05 +01:00
okx-code
eebfba106a Merge branch 'main' into afk-display 2024-10-09 01:34:36 +01:00
okx-code
9326f4776d fix combat util properly 2024-10-08 19:47:17 +01:00
Husky
7c952c1d9d add settings to control afk display 2024-09-17 09:51:08 -04:00
okx-code
5f5b7b7e50 Merge pull request #608 from CivMC/mc/1.21
Use new paper API
2024-08-26 16:33:25 +01:00
okx-code
2add283451 optimise imports 2024-08-26 16:24:44 +01:00
okx-code
d3a25d292f Use new paper API 2024-08-26 15:51:58 +01:00
Alexander
636b64f261 Switch from jsr305 to Jetbrains Annotations 2024-08-23 03:16:52 +01:00
okx-code
1b6e894aa6 Merge pull request #399 from Protonull/uuid-utils
Prune UuidUtils
2024-08-22 18:03:16 +01:00
okx-code
989f7166ab Merge pull request #539 from Protonull/update-repairables
Updates ItemExchange's repairables
2024-08-22 18:01:23 +01:00
okx-code
f0e2915ad8 fix armour 2024-08-21 22:46:06 +01:00
okx-code
86e9349bd7 I'm a liar 2024-08-21 16:00:40 +01:00
okx-code
a5fbdfba8c Fix old potion exchanges 2024-08-21 16:00:28 +01:00
okx-code
7de5891854 fix brewery 2024-08-21 15:47:27 +01:00
okx-code
b0cfbf9460 Reduce knockback a little bit 2024-08-21 01:59:07 +01:00
okx-code
0df7d049a7 Fix oozing NPE + fiddle with knockback a little bit 2024-08-21 01:53:59 +01:00
okx-code
f72ac265b6 No broken potions 2024-08-21 00:44:48 +01:00
okx-code
e0260b7f85 Fix armour and weapons for real 2024-08-21 00:24:55 +01:00
okx-code
8d53a4199c Merge pull request #591 from MrJeremyFisher/ping-fix
Fix roundPlayerListPing
2024-08-19 23:57:58 +01:00
okx-code
fefc1ff58d Update to 1.21 2024-08-19 22:49:53 +01:00
okx-code
3e0052da97 Fix /nlri again 2024-08-18 23:03:48 +01:00
okx-code
772abbfef1 Make it specifically for crates 2024-08-18 22:07:51 +01:00
okx-code
d002f68718 Fix minecarts 2024-08-18 18:00:58 +01:00
MrJeremyFisher
a9baef321a Fix roundPlayerListPing 2024-08-18 12:04:42 -04:00
okx-code
0ca93df6cb Fix itemexchange 2024-08-18 16:57:30 +01:00
okx-code
6548193dae Merge branch 'main' into mc-1.20.6 2024-08-18 16:14:46 +01:00
okx-code
de46446656 Update oldenchanting 2024-08-18 16:14:22 +01:00
okx-code
5a23670b5f update plugins 2024-08-18 15:34:32 +01:00
okx-code
3bf506f7be Use de-obfuscated jars 2024-08-18 14:24:47 +01:00
okx-code
ed667a5b44 Fix /nlri
Permissions check was in the wrong place
2024-08-18 02:31:07 +01:00
Husky
7ec9cd6eef Display AFK status in side/action bar 2024-08-17 14:30:53 -04:00
okx-code
7e47e78ffe move log 2024-08-17 14:50:36 +01:00
okx-code
944e974db4 Fix enchantments not randomising 2024-08-17 14:44:36 +01:00
Alexander
1ed28ded35 Prune UuidUtils 2024-08-13 06:42:39 +01:00
MrJeremyFisher
1e10956c6d Fix anvil jank with attributes and actually apply attributes (whoops) 2024-07-27 14:38:03 -04:00
AngrySoundTech
3629d70a4b Merge pull request #566 from MrJeremyFisher/remove-fixes
Remove outdated game fixes
2024-07-25 10:26:35 -04:00
MrJeremyFisher
ec1f42f0ef Move to DecentHolograms 2024-07-19 23:09:48 -04:00
Husky
0437822c64 move editorconfig 2024-07-19 21:29:30 -04:00
AngrySoundTech
272895eba5 Fix compile errors 2024-07-19 11:21:49 -04:00
AngrySoundTech
2018082517 Merge branch 'main' into mc-1.20.6
# Conflicts:
#	plugins/banstick-paper/build.gradle.kts
#	plugins/banstick-paper/src/main/resources/plugin.yml
#	plugins/bastion-paper/build.gradle.kts
#	plugins/bastion-paper/src/main/resources/plugin.yml
#	plugins/castlegates-paper/build.gradle.kts
#	plugins/castlegates-paper/src/main/java/com/aleksey/castlegates/utils/ParticleHelper.java
#	plugins/castlegates-paper/src/main/resources/plugin.yml
#	plugins/citadel-paper/build.gradle.kts
#	plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/listener/EntityListener.java
#	plugins/civchat2-paper/build.gradle.kts
#	plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
#	plugins/civduties-paper/src/main/resources/plugin.yml
#	plugins/civmodcore-paper/build.gradle.kts
#	plugins/civmodcore-paper/src/main/java/org/bukkit/pseudo/PseudoServer.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/config/ConfigHelper.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemUtils.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/MetaUtils.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/SpawnEggUtils.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTHelper.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTSerialization.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/nbt/NBTType.java
#	plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/impl/DisplayLocationSetting.java
#	plugins/civmodcore-paper/src/test/java/vg/civcraft/mc/civmodcore/nbt/NBTTests.java
#	plugins/combattagplus-paper/src/main/java/net/minelink/ctplus/listener/TagListener.java
#	plugins/combattagplus-paper/src/main/resources/plugin.yml
#	plugins/donum-paper/src/main/resources/plugin.yml
#	plugins/essenceglue-paper/build.gradle.kts
#	plugins/essenceglue-paper/src/main/resources/plugin.yml
#	plugins/exilepearl-paper/build.gradle.kts
#	plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/CoreDamageLogger.java
#	plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/core/CoreExilePearl.java
#	plugins/exilepearl-paper/src/main/java/com/devotedmc/ExilePearl/listener/PlayerListener.java
#	plugins/exilepearl-paper/src/main/resources/plugin.yml
#	plugins/factorymod-paper/build.gradle.kts
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/ConfigParser.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/interactionManager/FurnCraftChestInteractionManager.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintBookRecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintNoteRecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintingPlateJsonRecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintingPlateRecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/Upgraderecipe.java
#	plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/utility/MultiInventoryWrapper.java
#	plugins/factorymod-paper/src/main/resources/plugin.yml
#	plugins/finale-paper/build.gradle.kts
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/DamageListener.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/PotionListener.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/ToolProtectionListener.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/listeners/WeaponModificationListener.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/misc/AttributeModifier.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/misc/ItemUtil.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/misc/PotionArrowHandler.java
#	plugins/finale-paper/src/main/java/com/github/maxopoly/finale/overlay/ScoreboardHUD.java
#	plugins/finale-paper/src/main/resources/plugin.yml
#	plugins/hiddenore-paper/build.gradle.kts
#	plugins/hiddenore-paper/src/main/java/com/github/devotedmc/hiddenore/PlayerStateConfig.java
#	plugins/hiddenore-paper/src/main/java/com/github/devotedmc/hiddenore/util/FakePlayer.java
#	plugins/itemexchange-paper/build.gradle.kts
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/rules/BulkExchangeRule.java
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/rules/ExchangeRule.java
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/rules/modifiers/PotionModifier.java
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/utility/NBTEncodings.java
#	plugins/itemexchange-paper/src/main/java/com/untamedears/itemexchange/utility/Utilities.java
#	plugins/itemexchange-paper/src/main/resources/plugin.yml
#	plugins/jukealert-paper/build.gradle.kts
#	plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/gui/SnitchOverviewGUI.java
#	plugins/jukealert-paper/src/main/java/com/untamedears/jukealert/model/actions/impl/KillPlayerAction.java
#	plugins/jukealert-paper/src/main/resources/plugin.yml
#	plugins/kirabukkitgateway-paper/build.gradle.kts
#	plugins/kirabukkitgateway-paper/src/main/java/com/github/maxopoly/KiraBukkitGateway/impersonation/PseudoPlayer.java
#	plugins/kirabukkitgateway-paper/src/main/java/com/github/maxopoly/KiraBukkitGateway/impersonation/PseudoPlayerIdentity.java
#	plugins/kirabukkitgateway-paper/src/main/resources/plugin.yml
#	plugins/namelayer-paper/build.gradle.kts
#	plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/gui/GUIGroupOverview.java
#	plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/gui/MainGroupGUI.java
#	plugins/namelayer-paper/src/main/resources/plugin.yml
#	plugins/railswitch-paper/src/main/resources/plugin.yml
#	plugins/randomspawn-paper/build.gradle.kts
#	plugins/randomspawn-paper/src/main/resources/plugin.yml
#	plugins/realisticbiomes-paper/build.gradle.kts
#	plugins/realisticbiomes-paper/src/main/java/com/untamedears/realisticbiomes/utils/RealisticBiomesGUI.java
#	plugins/realisticbiomes-paper/src/main/resources/plugin.yml
#	plugins/simpleadminhacks-paper/build.gradle.kts
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/GameTuning.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/InvControl.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/SaplingHack.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/AntiFastBreak.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/ArthropodEggHack.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/AttrHider.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/BeeKeeping.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/CopperRail.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/HumbugBatchOne.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/OldEnchanting.java
#	plugins/simpleadminhacks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/SafeOreBreak.java
#	plugins/simpleadminhacks-paper/src/main/resources/plugin.yml
2024-07-19 10:52:45 -04:00
MrJeremyFisher
2f8c715526 Remove outdated game fixes 2024-07-15 23:11:17 -04:00
okx-code
00741e6258 reduce chance 2024-07-15 20:17:30 +01:00
okx-code
46f8d279cd Merge pull request #560 from MrJeremyFisher/fix-cg-connecting
Fix Connectable Blocks Not Connecting on Undraw
2024-07-15 18:14:07 +01:00
MrJeremyFisher
1e0ce59772 remove extra line 2024-07-14 23:46:18 -04:00
MrJeremyFisher
94634da5b5 Fix block neighbors not updating on undraw 2024-07-14 23:41:38 -04:00
Alexander
f43fcb9ff6 Add missing doors 2024-07-09 18:18:08 +01:00
MrJeremyFisher
b129e1bcb6 Simplify ParseFirstItem 2024-06-26 00:03:34 -04:00
MrJeremyFisher
70aa26a55a Fix SAH ping rewrite error 2024-06-25 21:22:09 -04:00
MrJeremyFisher
ba8b0bae9a Reviewed changes 2024-06-25 21:21:48 -04:00
MrJeremyFisher
7aeacd6f13 More autoformat cleanup 2024-06-25 11:14:28 -04:00