nmd/ForgeCraft
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixing merge conflict

Browse Source
This commit is contained in:
Mohammad-Ali Minaie
2018-02-25 12:39:05 -05:00
parent 983d6b0418 7506534655
commit 30dba0752e
19 changed files with 144 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kfc/src/main/resources/mcmod.info
View File

@@ -2,7 +2,11 @@
"modid": "forgecraft",
"name": "Kitsu's Forgecraft",
"description": "Forged with sweat and blood",
<<<<<<< HEAD
"version": "1.4.01",
=======
"version": "1.4.06",
>>>>>>> master-1.12
"mcversion": "1.12.2",
"url": "",
"updateUrl": "",