Luis C.M f5ac14b93e Merge branch 'patch' into dev ...

# Conflicts:
#	src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiButton.java
#	src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiTexturedRect.java
#	src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java

2023-06-01 16:35:04 -05:00

..

java

Merge branch 'patch' into dev

2023-06-01 16:35:04 -05:00

resources

Merge pull request #79 from Pilzinsel64/fix-de-typo

2023-05-09 13:30:42 -04:00