Merge pull request #11 from ssdh233/feature/merge-retail-and-classic

Merge classic and retail into one
ssdh233 · Aug 11, 2023 · 9f2b6a8 · 9f2b6a8
2 parents d0a2697 + d920d8f
commit 9f2b6a8
Show file tree

Hide file tree

Showing 34 changed files with 45 additions and 490,499 deletions.
diff --git a/classic/DictExportFrame.xml → DictExportFrame.xml b/classic/DictExportFrame.xml → DictExportFrame.xml
diff --git a/retail/DictFrame.lua → DictFrame.lua b/retail/DictFrame.lua → DictFrame.lua
diff --git a/classic/DictFrame.xml → DictFrame.xml b/classic/DictFrame.xml → DictFrame.xml
@@ -8,7 +8,7 @@
 			</OnClick>
     </Scripts>
   </Button>
-  <Frame name="DictFrame" parent="UIParent" frameStrata="DIALOG" toplevel="true" inherits="BasicFrameTemplateWithInset" hidden="true">
+  <Frame name="DictFrame" frameStrata="DIALOG" toplevel="true" parent="UIParent" inherits="BasicFrameTemplateWithInset" hidden="true">
     <Size>
       <AbsDimension x="600" y="428"/>
     </Size>

diff --git a/retail/DictFrame.xml → DictFrameRetail.xml b/retail/DictFrame.xml → DictFrameRetail.xml
diff --git a/classic/DictLogFrame.lua → DictLogFrame.lua b/classic/DictLogFrame.lua → DictLogFrame.lua
diff --git a/classic/DictLogFrame.xml → DictLogFrame.xml b/classic/DictLogFrame.xml → DictLogFrame.xml
diff --git a/retail/WoWDictFont.xml → WoWDictFont.xml b/retail/WoWDictFont.xml → WoWDictFont.xml
diff --git a/classic/DictFrame.lua b/classic/DictFrame.lua
diff --git a/classic/README.md b/classic/README.md
diff --git a/classic/WoWDictFont.xml b/classic/WoWDictFont.xml
diff --git a/classic/dict.lua b/classic/dict.lua
diff --git a/classic/dict.ecdict.part0.lua → dict.ecdict.part0.lua b/classic/dict.ecdict.part0.lua → dict.ecdict.part0.lua
diff --git a/classic/dict.ecdict.part1.lua → dict.ecdict.part1.lua b/classic/dict.ecdict.part1.lua → dict.ecdict.part1.lua
diff --git a/classic/dict.ecdict.part2.lua → dict.ecdict.part2.lua b/classic/dict.ecdict.part2.lua → dict.ecdict.part2.lua
diff --git a/classic/dict.ecdict.part3.lua → dict.ecdict.part3.lua b/classic/dict.ecdict.part3.lua → dict.ecdict.part3.lua
diff --git a/classic/dict.ecdict.part4.lua → dict.ecdict.part4.lua b/classic/dict.ecdict.part4.lua → dict.ecdict.part4.lua
diff --git a/classic/dict.ejdict.part0.lua → dict.ejdict.part0.lua b/classic/dict.ejdict.part0.lua → dict.ejdict.part0.lua
diff --git a/retail/dict.lua → dict.lua b/retail/dict.lua → dict.lua
@@ -14,4 +14,4 @@ DictSource = {
   }
 }
 
-DictKeys = {"cn", "ja"}
+DictKeys = {"cn", "ja"}
diff --git a/classic/fonts/phonetic.ttf → fonts/phonetic.ttf b/classic/fonts/phonetic.ttf → fonts/phonetic.ttf
diff --git a/retail/DictExportFrame.xml b/retail/DictExportFrame.xml
diff --git a/retail/DictLogFrame.lua b/retail/DictLogFrame.lua
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ DictSource = { @@
       }
     }
-    DictKeys = {"cn", "ja"}
+    DictKeys = {"cn", "ja"}