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

update from master-1.12 #16

Closed
kitsu wants to merge 9 commits from master-1.12 into nbtCrucible
pull from: master-1.12
merge into: nmd:nbtCrucible
Conversation 0 Commits 9 Files Changed 19 +145 -36

9 Commits

Author SHA1 Message Date
Mohammad-Ali Minaie
7506534655 updated version 2018-02-25 11:59:02 -05:00
Mohammad-Ali Minaie
31a063532a merge conflict in peroperties 2018-02-24 19:45:34 -05:00
kitsu
8932f51e90 Merge branch 'primal-update-20180223' of nmd/ForgeCraft into master-1.12 2018-02-24 02:37:53 +00:00
An Sar
8b033972ac update primal FireSource method, convert old EntityMuck reference to EntityMud, update CT build.gradle references 2018-02-23 18:29:50 -08:00
Mohammad-Ali Minaie
72c4677c4b fixed the langFile name 2018-01-07 18:02:15 -05:00
Mohammad-Ali Minaie
390248afd3 fixed merge conflicts 2018-01-06 19:35:43 -05:00
Mohammad-Ali Minaie
64429816bd updated to primal 0.6.12 2018-01-06 19:29:50 -05:00
Mohammad-Ali Minaie
392914ede3 fixed spewing broken tool heads 2017-12-02 18:05:18 -05:00
Mohammad-Ali Minaie
3a1c9676ab fixed bugs pushed .02 2017-11-29 22:13:57 -05:00