9
0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-28 03:19:15 +00:00
Commit Graph

22 Commits

Author SHA1 Message Date
Fisher2911
d961bd2966 Merge branch 'updates'
# Conflicts:
#	.gitignore
#	1.16/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.class
#	1.16/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_16_R3.class
#	1.16/build/libs/1.16.jar
#	1.16/build/tmp/compileJava/previous-compilation-data.bin
#	1.17/build/libs/1.17.jar
#	1.17/build/tmp/compileJava/previous-compilation-data.bin
#	1.18/build/libs/1.18.jar
#	1.18/build/tmp/compileJava/previous-compilation-data.bin
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/HMCCosmetics.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/api/CosmeticItem.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/api/HMCCosmeticsAPI.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/api/event/CosmeticChangeEvent.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/api/event/CosmeticItemEvent.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/command/CosmeticsCommand.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/concurrent/Threads.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/ActionSerializer.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/CosmeticSettings$1.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/CosmeticSettings.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/DyeGuiSerializer.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/GuiSerializer.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/ItemSerializer.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/Settings.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/SoundData.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/config/WardrobeSettings.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/cosmetic/CosmeticManager.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/database/Database.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/database/DatabaseConverter.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/database/DatabaseFactory.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/database/DatabaseType.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/database/dao/ArmorItemDAO.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/database/dao/UserDAO.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/ArmorItem$1.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/ArmorItem$Type.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/ArmorItem.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/ColorItem.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/CosmeticGui.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/CosmeticsMenu.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/DyeSelectorGui.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/Hook.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/HookManager.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/PAPIHook.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/item/ItemHook.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/item/ItemHooks.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/item/ItemsAdderHook.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/hook/item/OraxenHook.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/inventory/PlayerArmor.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/listener/ClickListener.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/listener/CosmeticFixListener.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/listener/JoinListener.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/listener/MoveListener.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/listener/PlayerShiftListener.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/listener/RespawnListener.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/listener/TeleportListener.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/listener/WardrobeClickListener.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/Adventure.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/ErrorMessages.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/Message$Type.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/Message.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/MessageHandler$1.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/MessageHandler.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/Messages$1.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/Messages.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/Permission.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/Placeholder.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/TitleMessage.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/message/Translation.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/packet/PacketManager.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/DataTask.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/ImmediateTask.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/InfiniteTask.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/SupplierTask.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/SyncedTask.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/Task.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/TaskChain.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/task/TaskManager.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/Equipment.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/User.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/UserManager$1.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/UserManager.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/user/Wardrobe.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/util/Keys.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/util/StringUtils.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/util/Utils.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/util/builder/ColorBuilder.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/util/builder/ItemBuilder.class
#	common/build/classes/java/main/io/github/fisher2911/hmccosmetics/util/builder/SkullBuilder.class
#	common/build/generated/plugin-yml/Bukkit/plugin.yml
#	common/build/resources/main/config.yml
#	common/build/resources/main/menus/main.yml
#	common/build/resources/main/messages.yml
#	common/build/resources/main/plugin.yml
#	common/build/tmp/compileJava/previous-compilation-data.bin
#	nms/build/libs/nms.jar
#	nms/build/tmp/compileJava/previous-compilation-data.bin
2022-03-06 18:32:10 -05:00
Fisher2911
badc2f7b87 Fixed invalid token config 2022-03-06 17:16:30 -05:00
Fisher2911
1fcbe27d6a Fixed placeholders 2022-03-06 17:02:48 -05:00
Fisher2911
8da9100dd3 Fixed typo 2022-03-06 16:41:22 -05:00
Fisher2911
1888145ee0 Fixed ProtocolLib enum null error on first call 2022-03-06 16:37:48 -05:00
Fisher2911
84864303fc Finished tokens 2022-03-06 16:07:21 -05:00
MasterOfTheFish
607d2ea7bd Fixed issue with dye items not running actions 2022-02-26 00:49:10 -05:00
MasterOfTheFish
23bcd56eac BALLOONS?? 2022-02-26 00:23:33 -05:00
MasterOfTheFish
35c6b01f34 Start balloon stuff 2022-02-23 19:38:49 -05:00
MasterOfTheFish
59dbee34ae Fixed placeholders not appearing on items in GUI menu 2022-02-23 08:53:25 -05:00
MasterOfTheFish
d12a5d090f Fixed concurrent error with citizens hook 2022-02-22 17:20:39 -05:00
MasterOfTheFish
068a147e1e Fixed citizens empty cosmetic overriding armor 2022-02-20 12:12:00 -05:00
MasterOfTheFish
98a6528e50 Fixed formatted placeholder 2022-02-19 22:17:17 -05:00
MasterOfTheFish
a3bce9b766 Stopped sending of blank messages 2022-02-19 21:15:50 -05:00
MasterOfTheFish
d10afc3df3 Fixed placeholder cosmetic items 2022-02-19 21:13:50 -05:00
MasterOfTheFish
a42730dc19 change up how user class works 2022-02-19 02:16:02 -05:00
Fisher2911
a7892ce434 Improved GUI 2022-02-17 19:47:03 -05:00
Fisher2911
39583b3685 Fixed wardrobe always active always stuck bug 2022-02-17 17:10:27 -05:00
Fisher2911
c75182d118 Bump version 2022-02-17 00:36:13 -05:00
Fisher2911
832980f593 Added skin overlay on wardrobe 2022-02-16 23:51:01 -05:00
lucian929
c8ee8c0c7c Remove some files 2022-02-15 12:40:52 -05:00
Fisher2911
f58d328bae update 2022-02-14 22:00:42 -05:00