compare 2 #12

Closed

kitsu wants to merge 4 commits from master-1.12 into master

pull from: master-1.12

merge into: nmd:master

nmd:feature-1.12

nmd:bugfix-1.12

nmd:master

nmd:master-1.11

nmd:test

Conversation 0 Commits 4 Files Changed 21 +288 -286

4 Commits

Author	SHA1	Message	Date
kitsu	a79a372729	Merge branch 'tile-factory' of nmd/ForgeCraft into master-1.12	2017-10-16 17:51:58 +00:00
An Sar	4203c42cb4	update to primal 0.6.x, version bump, increase forge to 1.12.2	2017-10-05 20:42:12 -07:00
Mohammad-Ali Minaie	f5bd23682c	updated lang file but lots of diff changes	2017-10-04 13:48:23 -04:00
Mohammad-Ali Minaie	6a0b872ebc	not completing download of Primal 5.11 dependency	2017-09-16 13:28:16 -04:00