fixed merge conflicts

This commit is contained in:
Mohammad-Ali Minaie
2018-01-06 19:35:43 -05:00
7 changed files with 13 additions and 13 deletions

View File

@@ -2,8 +2,8 @@
"modid": "forgecraft",
"name": "Kitsu's Forgecraft",
"description": "Forged with sweat and blood",
"version": "1.4.03",
"mcversion": "1.12.1",
"version": "1.4.04",
"mcversion": "1.12.2",
"url": "",
"updateUrl": "",
"authorList": ["KitsuShadow"],