P0nk 559fe2d550 Merge branch 'refs/heads/master' into feat/postgresql-database ...

# Conflicts:
#	config.yaml
#	docker-compose.yml
#	pom.xml
#	src/main/java/client/Character.java
#	src/main/java/client/Client.java
#	src/main/java/client/MonsterBook.java
#	src/main/java/client/command/commands/gm0/BuyBackCommand.java
#	src/main/java/client/processor/stat/AssignAPProcessor.java
#	src/main/java/config/ServerConfig.java
#	src/main/java/net/server/channel/Channel.java
#	src/main/java/net/server/channel/handlers/AbstractDealDamageHandler.java
#	src/main/java/net/server/channel/handlers/BuddylistModifyHandler.java
#	src/main/java/net/server/channel/handlers/CloseRangeDamageHandler.java
#	src/main/java/net/server/channel/handlers/EnterMTSHandler.java
#	src/main/java/net/server/channel/handlers/NPCTalkHandler.java
#	src/main/java/net/server/channel/handlers/RangedAttackHandler.java
#	src/main/java/net/server/channel/handlers/SummonDamageHandler.java
#	src/main/java/net/server/channel/handlers/UseCashItemHandler.java
#	src/main/java/net/server/handlers/login/CreateCharHandler.java
#	src/main/java/net/server/world/World.java
#	src/main/java/scripting/npc/NPCConversationManager.java
#	src/main/java/server/ItemInformationProvider.java
#	src/main/java/server/life/Monster.java
#	src/main/java/server/life/MonsterInformationProvider.java
#	src/main/java/server/maps/MapleMap.java
#	src/main/java/tools/PacketCreator.java
#	src/test/java/service/NoteServiceTest.java
#	src/test/java/testutil/Any.java

2024-09-02 20:43:55 +02:00

..

autoban

Move some autoban logic to new BanService

2023-08-10 22:52:09 +02:00

command

Merge branch 'refs/heads/master' into feat/postgresql-database

2024-09-02 20:43:55 +02:00

creator

Addressed nitpicks and removed unused item ID constants

2024-02-05 17:00:18 +00:00

inventory

Remove all wildcard imports

2024-05-22 08:33:44 +02:00

keybind

Rename and clean up MapleQuickslotBinding

2021-09-09 20:59:45 +02:00

newyear

Use TimeUnit for time calculations

2021-09-10 19:08:58 +02:00

processor

Merge branch 'refs/heads/master' into feat/postgresql-database

2024-09-02 20:43:55 +02:00

status

Reformat and clean up "client" package

2021-09-09 23:22:44 +02:00

AbstractCharacterListener.java

Reformat and clean up "client" package

2021-09-09 23:22:44 +02:00

AbstractCharacterObject.java

Remove monitored read/write locks, use basic version

2022-08-11 14:16:06 +02:00

BuddyList.java

Merge branch 'refs/heads/master' into feat/postgresql-database

2024-09-02 20:43:55 +02:00

BuddylistEntry.java

Reformat and clean up "client" package

2021-09-09 23:22:44 +02:00

BuffStat.java

Rename and clean up MapleBuffStat

2021-09-09 21:02:22 +02:00

Character.java

Merge branch 'refs/heads/master' into feat/postgresql-database

2024-09-02 20:43:55 +02:00

Client.java

Merge branch 'refs/heads/master' into feat/postgresql-database

2024-09-02 20:43:55 +02:00

DefaultDates.java

Change default birthday and tempban to fix conversion issue

2021-04-02 16:12:57 +02:00

Disease.java

Disease and MCSkill hold MobSkillType instead of int

2022-09-03 05:20:54 +02:00

DiseaseValueHolder.java

Rename and clean up MapleDiseaseValueHolder

2021-09-09 21:16:02 +02:00

Family.java

Migrate yet another batch of FilePrinter users to Slf4j

2022-02-09 21:05:22 +01:00

FamilyEntitlement.java

Rename and clean up MapleFamilyEntitlement

2021-09-09 21:17:31 +02:00

FamilyEntry.java

Migrate yet another batch of FilePrinter users to Slf4j

2022-02-09 21:05:22 +01:00

Job.java

Rename and clean up MapleJob

2021-09-09 21:21:04 +02:00

MonsterBook.java

Merge branch 'refs/heads/master' into feat/postgresql-database

2024-09-02 20:43:55 +02:00

Mount.java

Rename and clean up MapleMount

2021-09-09 21:22:04 +02:00

QuestStatus.java

Remove all wildcard imports

2024-05-22 08:33:44 +02:00

Ring.java

Clean up code & Upgrade syntax to new Java

2022-08-07 01:35:02 +07:00

Skill.java

Reformat and clean up "client" package

2021-09-09 23:22:44 +02:00

SkillFactory.java

Remove all wildcard imports

2024-05-22 08:33:44 +02:00

SkillMacro.java

Reformat and clean up "client" package

2021-09-09 23:22:44 +02:00

SkinColor.java

Rename and clean up MapleSkinColor

2021-09-09 21:24:36 +02:00

Stat.java

Upgrade to Java NIO

2022-07-30 16:10:46 +07:00