Commit Graph

64 Commits

Author SHA1 Message Date
okx-code
64943bbb62 fix 2025-10-08 03:20:48 +01:00
okx-code
d050b0456c wip 2025-10-08 03:20:47 +01:00
Husky
744182a004 plugins should also use version catalogue 2025-09-10 22:43:15 -04:00
Husky
b5583db564 warn user when they reach max essence 2025-02-23 21:07:07 -05:00
AngrySoundTech
5e04c343bc Move versions to version catalog 2025-01-04 11:48:26 -05:00
Alexander
4fc0b4ad58 Defers paper versioning to libs.versions.toml 2025-01-04 10:46:27 -05:00
okx-code
ab145a621d Reapply "update to 1.21.3"
This reverts commit a2e1c7dd1b.
2024-12-15 01:48:34 +00:00
awoo
89a258a919 Fix ambiguous essence claim message
"Claim" implies that if i do not run the proposed command I will not receive the essence. 

I simply used the already existing wording from https://github.com/CivMC/Civ/blob/main/plugins/essenceglue-paper/src/main/java/com/github/maxopoly/essenceglue/commands/EssenceCommand.java#L36
2024-12-08 05:43:23 +00:00
okx-code
9b1fb03c23 add message 2024-12-06 23:35:49 +00:00
okx-code
bd7c88cb94 add essence pouches 2024-12-06 22:35:41 +00:00
okx-code
fefc1ff58d Update to 1.21 2024-08-19 22:49:53 +01: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
cbaf56cbb3 Format 2024-06-21 17:51:55 -04:00
MrJeremyFisher
32a270c7a7 Standardize editorconfig 2024-06-21 17:49:37 -04:00
MrJeremyFisher
9518c14d90 1.20.6 2024-06-18 11:53:29 -04:00
okx-code
4d6532456e Merge branch 'main' into mc/1.20
# Conflicts:
#	plugins/civduties-paper/build.gradle.kts
#	settings.gradle.kts
2024-02-23 22:33:27 +00:00
okx-code
28c98db2f9 fix indentation 2024-02-23 22:25:32 +00:00
okx-code
d3ca24267b Merge branch 'essenceglue' into mc/1.20 2024-02-23 22:03:47 +00:00
okx-code
d966ae9eda fix name 2024-02-23 21:58:50 +00:00
okx-code
a30374107f Update EssenceGlue to 1.20 2024-02-23 01:31:15 +00:00
okx-code
312a04c802 Add EsssenceGlue 2024-02-22 22:21:05 +00:00
Cola
2d6c169456 Comment out streak message 2022-05-26 15:36:30 +01:00
AngrySoundTech
ea2080cc88 Add gradle wrapper
Closes #5
2022-05-20 15:54:08 -04:00
Cola
0bb1a8d4e9 1.18.2 2022-03-08 00:44:45 +00:00
Cola
892e6a0164 Update plugin.yml 2022-01-03 22:48:30 +00:00
Cola
1a7672bf07 Oops 2022-01-03 22:46:37 +00:00
Cola
9889a25988 Nearly there
Just NuVotifier being a pain
2022-01-03 22:46:25 +00:00
Cola
4aa3df7dde Merge remote-tracking branch 'CivMC/master' into 16+17 2022-01-03 22:17:39 +00:00
wingzero54
99b46e5979 Create README.md 2021-11-13 12:59:48 -06:00
Cola
3ca8462869 1.17.1 2021-07-18 23:57:08 +01:00
Cola
e644f981d6 Latest CMC 2021-07-05 20:05:09 +01:00
Cola
a58be6a1b7 Register commands 2021-07-03 18:54:01 +01:00
Cola
8d8a2a951d Fix main path 2021-07-01 19:30:18 +01:00
Cola
223c284d27 v1.2.0 - Java 16 & 1.17 2021-07-01 19:27:29 +01:00
Cola
6fa93aac6f Remove You can vote in... msgs on login 2021-05-25 17:48:35 +01:00
wingzero54
c57882402f Merge pull request #12 from Protonull/patch-2
Switch to JitPack for NuVotifier
2021-05-24 21:05:51 -05:00
wingzero54
7617993ba4 Merge pull request #10 from Protonull/patch-1
Update to 1.16.5
2021-05-20 17:34:35 -05:00
Cola
ae521b5239 Add /config options 2021-05-17 12:56:23 +01:00
Cola
88889a3c1f Scrape /vote command for logic 2021-05-17 12:15:45 +01:00
Alexander
97a0533523 Switch to JitPack for NuVotifier
Fixes #11
2021-05-16 22:51:28 +01:00
Alexander
f281340d7f Update to 1.16.5 2021-05-05 13:06:06 +01:00
Alexander
18cedd717e Update to CivModCore 1.8.2 2021-01-22 16:54:13 +00:00
Maxopoly
1fadc2b82a Update to 1.16.4 2021-01-01 02:58:49 +01:00
Diet Cola
bffe153718 Add icon
Dependant on: https://github.com/CivClassic/CivModCore/pull/65
2020-12-14 13:00:23 +00:00
Maxopoly
e0290a45c4 Lookup uuid for mojang names to let namechanged players vote 2020-08-12 05:56:17 +02:00
Maxopoly
b2973c63fb Update to 1.16 2020-07-28 04:48:57 +02:00
Maxopoly
114af87fcf Update Jenkinsfile 2020-06-11 23:40:35 +02:00
Maxopoly
cf1d7836bd Switch license to AGPL 2020-06-07 20:40:11 +02:00
Maxopoly
779f69f58c Fix bug downgrading pearled player streaks on pearl decay 2020-05-29 06:07:54 +02:00
Maxopoly
37e1779765 Jenkins ready 2020-05-29 04:40:27 +02:00