Commit Graph

390 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
8932f51e90 Merge branch 'primal-update-20180223' of nmd/ForgeCraft into master-1.12 2018-02-24 02:37:53 +00:00
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
Mohammad-Ali Minaie
a4512116cf Adding Helmet, command to show wiki, modify rendering, create recipe for shift click or lack of nonsense 2017-11-05 13:34:21 -05:00
An Sar
de70bb442c Merge branch 'ansar-0.6' of nmd/ForgeCraft into master-1.12 2017-10-28 23:18:51 +00:00
a7e3b222fe Merge branch 'master-1.12' into ansar-0.6 2017-10-28 16:10:42 -07:00
08ecdf8fa4 update mcp mappings, sync with changes in primal 0.6.x 2017-10-28 16:06:08 -07:00
Mohammad-Ali Minaie
b8e84dc824 update to client proxy registry 2017-10-28 18:50:20 -04:00
Mohammad-Ali Minaie
118ef3f90b Trying to add armor 2017-10-25 19:37:34 -04:00
a79a372729 Merge branch 'tile-factory' of nmd/ForgeCraft into master-1.12 2017-10-16 17:51:58 +00:00
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
Mohammad-Ali Minaie
f708ac25f5 version bump 2017-09-16 10:47:08 -04:00
Mohammad-Ali Minaie
01834a6d77 fixed the API occorunces 2017-09-16 10:45:49 -04:00
Mohammad-Ali Minaie
b3d329c273 switch 12.1 to 12 2017-09-15 16:35:52 -04:00
Mohammad-Ali Minaie
9038bfc5ea fixed forge version 2017-09-15 16:31:45 -04:00
Mohammad-Ali Minaie
6d3533e588 big diff in the files 2017-09-15 16:15:23 -04:00
Mohammad-Ali Minaie
6f955f14f0 updating with new primal version 2017-09-15 16:12:49 -04:00
b374045de2 Merge branch 'primal-update' of nmd/ForgeCraft into master-1.12 2017-09-15 10:27:26 +00:00
b29071c6b4 Primal Blocks/Items refactor 2017-09-14 21:18:48 -07:00
b07102edd5 Update PrimalCore API changes 2017-09-14 18:15:47 -07:00
Mohammad-Ali Minaie
f0377332d8 fixed heating of damaged tools 2017-09-04 21:30:58 -04:00
Mohammad-Ali Minaie
622a3f4b17 fixing bugs 2017-09-04 13:24:17 -04:00
Mohammad-Ali Minaie
6fd05cffd5 updating lang file 2017-09-03 22:29:58 -04:00
srw
33c0582287 update to 1.12.1 2017-08-30 19:04:06 -07:00
Mohammad-Ali Minaie
6f084a9fa2 updating the .12 branch 2017-07-28 00:03:09 -04:00
Mohammad-Ali Minaie
24793d7606 update all branches with new build version 2017-07-16 15:14:40 -04:00
7f9e5ad294 Merge branch 'crashfix-20170716' of nmd/ForgeCraft into master-1.11 2017-07-16 19:13:32 +00:00
srw
eb07701181 replace tag methods with NBTHelpers, fixes null point exception crash 2017-07-16 15:08:28 -04:00
Mohammad-Ali Minaie
6476b0aee1 update to fix bug with toolhead drop missing NBT 2017-07-15 14:30:13 -04:00
Mohammad-Ali Minaie
4e270cccc1 update to newest primal version 2017-07-08 18:25:59 -04:00
Mohammad-Ali Minaie
f9e546d66b oops wrong branch 2017-07-08 13:57:37 -04:00
Mohammad-Ali Minaie
25d426ff31 fixed item drop for item tool breaking and breaker not breaking 2017-07-06 06:28:28 -04:00
Mohammad-Ali Minaie
210c023f2b fixed bug where tool could be repaired for free 2017-07-05 22:25:00 -04:00
Mohammad-Ali Minaie
6744c4b22d fixed epic dup bug and added broken item drops for tools, ur still better off not breaking ur tool 2017-07-05 22:15:32 -04:00
Mohammad-Ali Minaie
d0a9606931 version bump 2017-07-04 21:29:39 -04:00
Mohammad-Ali Minaie
93374f71d9 fix bunch of shit 2017-07-04 21:28:53 -04:00
Mohammad-Ali Minaie
d597e3d2c6 fixed longbow bug 2017-07-03 23:43:24 -04:00
Mohammad-Ali Minaie
226eb7a62f fixing stonetongs bug unable to replicate switching all state flags to 2 2017-07-03 20:26:37 -04:00
Mohammad-Ali Minaie
3040b4cc52 merge longbow and version bump 2017-07-03 18:51:29 -04:00
Mohammad-Ali Minaie
256ea2b4db update sound 2017-07-03 18:47:11 -04:00
Mohammad-Ali Minaie
f3e71409fd finished feature arrow 2017-07-03 18:44:21 -04:00
Mohammad-Ali Minaie
4440c4bd19 tweaked recipes 2017-07-03 08:47:13 -04:00