Merge remote-tracking branch 'origin/entity-system-rewrite' into entity-system-rewrite

Browse Source

# Conflicts:
#	src/main/java/lol/pyr/znpcsplus/npc/NPC.java
#	src/main/java/lol/pyr/znpcsplus/npc/NPCType.java
#	src/main/java/lol/pyr/znpcsplus/packets/PacketFactory.java
#	src/main/java/lol/pyr/znpcsplus/packets/V1_8Factory.java

...

This commit is contained in:

Pyrbu 2023-04-24 17:13:41 +01:00

parent b24a6ef93d c4a5874dca

commit a98e75df2f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available