Merge branch 'feature' into development

Zlimon · Dec 29, 2020 · fefce66 · fefce66
2 parents c1fd3b8 + fe6b597
commit fefce66
Show file tree

Hide file tree

Showing 166 changed files with 6,899 additions and 3,994 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,7 @@ yarn-error.log
 .vagrant
 /ssl/BaltimoreCyberTrustRoot.crt.pem
 /public/resource-packs/*
-/public/js/*
+/public/js/*
+/.idea/*
+_ide_helper.php
+.phpstorm.meta.php
diff --git a/.idea/RuneManager-OSRS.iml b/.idea/RuneManager-OSRS.iml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml