updated changelog and added fallout 4 dictionary files

matortheeternal · Sep 25, 2016 · 351a691 · 351a691
1 parent 3d3f833
commit 351a691
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/backend/FO4Dictionary.txt b/backend/FO4Dictionary.txt
@@ -0,0 +1 @@
+Fallout4.esm;1740792;2.2;-1.0;1;[User: Mator] [Hash: A220F75A] [Version: 2.2]@13Can't merge Bethesda files.@13@13
diff --git a/backend/changelog.txt b/backend/changelog.txt
@@ -109,4 +109,7 @@ Version 2.1.3.0
   - Returned the limitation on the fails and files sections of the Merge Details view of 1000 items each
   - When the merge destination directory is the data folder Merge Plugins will put merged assets directly into the folder instead of creating a subfolder for each merge
   - Merge Plugins no longer breaks due to different regional Decimal Separator characters.
-  - Fixed the OK button of the Options Form not updating when changing the Merge destination directory
+  - Fixed the OK button of the Options Form not updating when changing the Merge destination directory
+
+Version 2.2.0.0
+  - Added Fallout 4 support
diff --git a/frontend/FO4Dictionary.txt b/frontend/FO4Dictionary.txt
@@ -0,0 +1 @@
+Fallout4.esm;1740792;2.2;-1.0;1;[User: Mator] [Hash: A220F75A] [Version: 2.2]@13Can't merge Bethesda files.@13@13
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fallout4.esm;1740792;2.2;-1.0;1;[User: Mator] [Hash: A220F75A] [Version: 2.2]@13Can't merge Bethesda files.@13@13