In GitLab by @KingCobra_200 on Jan 7, 2021, 18:22

Merges master -> master

Added Food shop. Fixed Guild progress bar. (Does not take as long)

requested review from @SamB440

Follow naming conventions. InterFace -> interface.

Add obfuscation helpers. i2 is width. I believe i is x position of the texture in the png file, and i1 is the y.

In GitLab by @KingCobra_200 on Jan 12, 2021, 16:52

Commented on src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/widget/ShopButtonWidget.java line 17

changed this line in version 2 of the diff

In GitLab by @KingCobra_200 on Jan 12, 2021, 16:52

Commented on src/main/java/com/convallyria/taleofkingdoms/client/gui/entity/widget/ShopScreenInterface.java line 12

changed this line in version 2 of the diff

In GitLab by @KingCobra_200 on Jan 12, 2021, 16:52

added 2 commits

• e52ae2a - Worked on shop GUI.
• 336a954 - Worked on shop GUI.

Compare with previous version

resolved all threads

approved this merge request

mentioned in commit 9c603d2