Commit Graph

2 Commits

Author SHA1 Message Date
FantasyPvP 46c7c98766 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	pom.xml
#	src/main/java/fantasypvp/kand/events/FireDamageListener.java
#	src/main/java/fantasypvp/kand/items/BlazingHalo.java
#	src/main/java/fantasypvp/kand_smp/Kand_smp.java
2024-07-11 12:07:37 +01:00
FantasyPvP bb1e1d8b0b - added some custom food and drinks
- added kand coins
- started working on the blazing set
2024-07-11 12:06:50 +01:00