Commit Graph

556 Commits

Author SHA1 Message Date
Mohammad-Ali Minaie
4bb3b25286 fixed rendering issue with placing crucible again aslo it wont change color 2018-02-25 16:20:26 -05:00
Mohammad-Ali Minaie
ebad0995ef Whiteshirt found blocks and itemBlocks being registered for everything 2018-02-25 15:17:33 -05:00
Mohammad-Ali Minaie
0d7b17305e trying to render the crucible 2018-02-25 14:51:23 -05:00
Mohammad-Ali Minaie
30dba0752e fixing merge conflict 2018-02-25 12:39:05 -05:00
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
Mohammad-Ali Minaie
983d6b0418 commit current functioning code, needs assets 2018-02-24 19:43:22 -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
01250d528c crucible happy path is working 2018-01-25 13:34:04 -05:00
Mohammad-Ali Minaie
72c4677c4b fixed the langFile name 2018-01-07 18:02:15 -05:00
Mohammad-Ali Minaie
81c9ff54a7 happy path achieved 2018-01-07 00:45:42 -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
008332636b crazy nbt full retard need to make an itemslot 2018-01-06 17:33:33 -05:00
Mohammad-Ali Minaie
19730303c2 crucible add and pickup is working 2017-12-17 02:20:14 -05:00
Mohammad-Ali Minaie
a40b72eea6 push more 2017-12-17 00:56:21 -05:00
Mohammad-Ali Minaie
b3275e5f8e pusing current code 2017-12-17 00:50:14 -05:00
Mohammad-Ali Minaie
8a4d0cf70c trying to pass NBT around and crashing 2017-12-17 00:09:25 -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
c7be7d569f crucible recipe manager is working 2017-11-29 06:59:36 -05:00
Mohammad-Ali Minaie
c32b0be9cc fixed the crucible crafting 2017-11-24 00:20:41 -05:00
Mohammad-Ali Minaie
4fd1da1215 got ingredient recipe 2017-11-16 22:04:44 -05:00
Mohammad-Ali Minaie
37ab61a195 trying nbt based crucible processing 2017-11-13 07:55:44 -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