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

Commit Graph

  • fed30aef92 Merge branch 'master-1.12' into feature-1.12 Mohammad-Ali Minaie 2018-09-21 23:42:59 -04:00
  • 6f5dd58fc5 fixed slot tongs rendering Mohammad-Ali Minaie 2018-09-21 23:25:16 -04:00
  • a45d502cc6 fixed render desnyc for tongs Mohammad-Ali Minaie 2018-09-21 23:19:19 -04:00
  • 456b51827c Merge branch 'master-1.12' into feature-1.12 Mohammad-Ali Minaie 2018-09-21 20:57:43 -04:00
  • ad4ba47527 fixed nbt breaking and rendering issues Mohammad-Ali Minaie 2018-09-21 20:55:47 -04:00
  • bd6f01c244 working on copper tools and weapons / weapon upgrades Mohammad-Ali Minaie 2018-09-21 11:03:10 -04:00
  • 6656a2a3ab update version, start weapon upgrades Mohammad-Ali Minaie 2018-09-21 00:04:40 -04:00
  • 7151eef000 fixing the bugs Mohammad-Ali Minaie 2018-09-20 18:36:13 -04:00
  • d17f020fc5 fixed a lot of things getting ready to push overwrite master-1.12 Mohammad-Ali Minaie 2018-09-20 12:59:34 -04:00
  • 498847ad88 updating more casting and crucible shit Mohammad-Ali Minaie 2018-09-18 17:10:52 -04:00
  • 53df487ec2 updated recipe management Mohammad-Ali Minaie 2018-09-18 10:00:42 -04:00
  • e083708a57 reworking the casting classes Mohammad-Ali Minaie 2018-09-17 23:00:31 -04:00
  • 8c6fbac6b0 switch out lacquerstick for OreDict treated stick Mohammad-Ali Minaie 2018-09-17 04:53:48 -04:00
  • 65e42b39c2 fixed Anvil JEI Mohammad-Ali Minaie 2018-09-17 04:38:12 -04:00
  • ff8170b01e trying to add Anvil Recipe JEI Mohammad-Ali Minaie 2018-09-17 00:40:34 -04:00
  • 4e353b9f3c add JEI for Crucibles, adding JEI for anvil Mohammad-Ali Minaie 2018-09-16 21:37:20 -04:00
  • ec1d66e3d7 updating recipe category, trying to render input slots Mohammad-Ali Minaie 2018-09-15 20:01:33 -04:00
  • bfda82bc78 Merge branch 'ansar-jei' of nmd/ForgeCraft into nbtCrucible kitsu 2018-09-15 22:39:56 +00:00
  • c12d708e48 jei test srw 2018-09-15 15:35:06 -07:00
  • e38ef6bdfa Merge branch 'ansar-hibachi' of nmd/ForgeCraft into nbtCrucible kitsu 2018-09-15 22:11:57 +00:00
  • 49c877afd3 add hibachi/drying recipe for the soft crucible srw 2018-09-15 15:07:04 -07:00
  • 0714f9f0fa update gradle.properties Mohammad-Ali Minaie 2018-09-15 17:46:13 -04:00
  • d25777955f jei crashing on load Mohammad-Ali Minaie 2018-09-15 16:35:12 -04:00
  • 9858d8b553 update checker Mohammad-Ali Minaie 2018-09-15 16:13:09 -04:00
  • d0026da88a fuck JEI Mohammad-Ali Minaie 2018-09-15 16:08:14 -04:00
  • 83a3061a99 fixed Anvil unable to accept upgrades, fixed crucibles not returning cooked output, fixed molten layer model for hot crucibles in blockstate Mohammad-Ali Minaie 2018-09-13 08:23:54 -04:00
  • 4d889481c0 updating anvilDoWork Mohammad-Ali Minaie 2018-09-13 07:23:38 -04:00
  • 5d85dd7a8e fixing anvil inventory manager Mohammad-Ali Minaie 2018-09-13 07:12:12 -04:00
  • 5562a58f44 update todo Mohammad-Ali Minaie 2018-09-12 17:19:46 -04:00
  • fd347fe3e3 SlottedTongs now can cool and drop its hot ingot in a barrel or water or rain_water also starting JEI fml Mohammad-Ali Minaie 2018-09-11 11:43:09 -04:00
  • 63697d731d add all Damascus recipes Mohammad-Ali Minaie 2018-09-10 14:17:55 -04:00
  • 74a83aaa37 renamed to-dos to avoid merge conflict Mohammad-Ali Minaie 2018-09-10 06:07:14 -04:00
  • 9f302566f6 updated rendering and models, still need hibachi recipe, JEI, and CT Mohammad-Ali Minaie 2018-09-10 06:06:07 -04:00
  • bdf423d764 fixed renders, models, and casting logic Mohammad-Ali Minaie 2018-09-07 10:47:37 -04:00
  • e7abf79946 updates to rendering and models, need more Mohammad-Ali Minaie 2018-09-04 22:07:45 -04:00
  • 7828c9b110 update breaker handler to match master-1.12 Mohammad-Ali Minaie 2018-09-01 17:06:45 -04:00
  • 84992ccdc1 ready to start CT support. Need to make sure tongs models are still good Mohammad-Ali Minaie 2018-08-31 08:13:55 -04:00
  • d8256951d4 item render is working, need to add all use cases Mohammad-Ali Minaie 2018-08-30 08:19:31 -04:00
  • 5f8d0c40c2 updated assets trying to get the itemnbtcrucible rendering to work Mohammad-Ali Minaie 2018-08-30 08:05:24 -04:00
  • d0578ca56b need to updated nbtCrucible models to have textured filling instead of flat also need to updated dirt_sand texture Mohammad-Ali Minaie 2018-08-21 23:13:48 -04:00
  • 3e98f3998c updated models, addted to todo.md Mohammad-Ali Minaie 2018-08-21 17:41:18 -04:00
  • 132cb98443 updated assets Mohammad-Ali Minaie 2018-08-21 08:05:32 -04:00
  • ba55b234b6 matched code in a class to avoid future merge conflict Mohammad-Ali Minaie 2018-08-19 17:41:11 -04:00
  • 04a1a50f08 updating resources to match new crucible rendering Mohammad-Ali Minaie 2018-08-19 17:22:09 -04:00
  • 71eaeb1d5d modified the updated logic for the crucible to write to nbt state changes Mohammad-Ali Minaie 2018-08-19 02:21:29 -04:00
  • d77142c6e0 cant figure out issue with picking up and placing crucibles and not remembering state, probably has to do with placement code Mohammad-Ali Minaie 2018-08-19 02:00:45 -04:00
  • 4c967f7e87 updated crucible to have filling textures Mohammad-Ali Minaie 2018-08-17 21:03:24 -04:00
  • 935371ed6c updated tickets and todos Mohammad-Ali Minaie 2018-08-15 11:41:29 -04:00
  • 01e97eacff version updating complete Mohammad-Ali Minaie 2018-08-14 16:15:20 -04:00
  • a633ace5e3 update Forge and dependency versions Mohammad-Ali Minaie 2018-08-14 16:14:36 -04:00
  • 9807be1f8d made updates with new Core version need to update gradle properties Mohammad-Ali Minaie 2018-08-14 16:12:42 -04:00
  • fdc0d90144 fixed the bronze ingot crucible upgrades, need to modify the casting recipes and the nbtcrucible model to open top Mohammad-Ali Minaie 2018-06-02 14:56:45 -04:00
  • 2b4b432db1 fixed crafttweaker breaking launch but messed up rendering Mohammad-Ali Minaie 2018-05-29 14:56:52 -04:00
  • 6d8e0c2187 update wootz crafting Mohammad-Ali Minaie 2018-05-06 01:45:44 -04:00
  • 1889fd10a0 a lot of things to delete, need to add bronze crucible recipe, need to remove bloomery recipes and update crucible recipes, need wootz tools and weaponss Mohammad-Ali Minaie 2018-05-06 00:39:45 -04:00
  • bb7c22aac2 more tongs and ingot assets Mohammad-Ali Minaie 2018-04-30 22:01:06 -04:00
  • b7eb357f9d refactor all the anvil code and the slot tongs code, need to finish all the slotted tongs models now Mohammad-Ali Minaie 2018-04-30 01:27:50 -04:00
  • b593173489 removed a lot of blocks removed block ingots and made them all items Mohammad-Ali Minaie 2018-04-07 23:24:13 -04:00
  • 024360389e much closer to stable state Mohammad-Ali Minaie 2018-03-11 21:29:09 -04:00
  • 117b3fd0f3 updated state doesn't seem to be working Mohammad-Ali Minaie 2018-03-10 23:21:12 -05:00
  • cadbe7e204 more json updates Mohammad-Ali Minaie 2018-03-10 23:09:51 -05:00
  • 6b763a0337 updated the blockstate Mohammad-Ali Minaie 2018-03-10 23:06:56 -05:00
  • adae8e3d82 need to use state with executing state Mohammad-Ali Minaie 2018-03-10 22:09:34 -05:00
  • 4bb3b25286 fixed rendering issue with placing crucible again aslo it wont change color Mohammad-Ali Minaie 2018-02-25 16:20:26 -05:00
  • ebad0995ef Whiteshirt found blocks and itemBlocks being registered for everything Mohammad-Ali Minaie 2018-02-25 15:17:33 -05:00
  • 0d7b17305e trying to render the crucible Mohammad-Ali Minaie 2018-02-25 14:51:23 -05:00
  • 30dba0752e fixing merge conflict Mohammad-Ali Minaie 2018-02-25 12:39:05 -05:00
  • 7506534655 updated version Mohammad-Ali Minaie 2018-02-25 11:59:02 -05:00
  • 31a063532a merge conflict in peroperties Mohammad-Ali Minaie 2018-02-24 19:45:34 -05:00
  • 983d6b0418 commit current functioning code, needs assets Mohammad-Ali Minaie 2018-02-24 19:43:22 -05:00
  • 8932f51e90 Merge branch 'primal-update-20180223' of nmd/ForgeCraft into master-1.12 kitsu 2018-02-24 02:37:53 +00:00
  • 8b033972ac update primal FireSource method, convert old EntityMuck reference to EntityMud, update CT build.gradle references An Sar 2018-02-23 18:29:50 -08:00
  • 01250d528c crucible happy path is working Mohammad-Ali Minaie 2018-01-25 13:34:04 -05:00
  • 72c4677c4b fixed the langFile name Mohammad-Ali Minaie 2018-01-07 18:02:15 -05:00
  • 81c9ff54a7 happy path achieved Mohammad-Ali Minaie 2018-01-07 00:45:42 -05:00
  • 390248afd3 fixed merge conflicts Mohammad-Ali Minaie 2018-01-06 19:35:43 -05:00
  • 64429816bd updated to primal 0.6.12 Mohammad-Ali Minaie 2018-01-06 19:29:50 -05:00
  • 008332636b crazy nbt full retard need to make an itemslot Mohammad-Ali Minaie 2018-01-06 17:33:33 -05:00
  • 19730303c2 crucible add and pickup is working Mohammad-Ali Minaie 2017-12-17 02:20:14 -05:00
  • a40b72eea6 push more Mohammad-Ali Minaie 2017-12-17 00:56:21 -05:00
  • b3275e5f8e pusing current code Mohammad-Ali Minaie 2017-12-17 00:50:14 -05:00
  • 8a4d0cf70c trying to pass NBT around and crashing Mohammad-Ali Minaie 2017-12-17 00:09:25 -05:00
  • 392914ede3 fixed spewing broken tool heads Mohammad-Ali Minaie 2017-12-02 18:05:18 -05:00
  • 3a1c9676ab fixed bugs pushed .02 Mohammad-Ali Minaie 2017-11-29 22:13:57 -05:00
  • c7be7d569f crucible recipe manager is working Mohammad-Ali Minaie 2017-11-29 06:59:36 -05:00
  • c32b0be9cc fixed the crucible crafting Mohammad-Ali Minaie 2017-11-24 00:20:41 -05:00
  • 4fd1da1215 got ingredient recipe Mohammad-Ali Minaie 2017-11-16 22:04:44 -05:00
  • 37ab61a195 trying nbt based crucible processing Mohammad-Ali Minaie 2017-11-13 07:55:44 -05:00
  • a4512116cf Adding Helmet, command to show wiki, modify rendering, create recipe for shift click or lack of nonsense Mohammad-Ali Minaie 2017-11-05 13:34:21 -05:00
  • de70bb442c Merge branch 'ansar-0.6' of nmd/ForgeCraft into master-1.12 An Sar 2017-10-28 23:18:51 +00:00
  • a7e3b222fe Merge branch 'master-1.12' into ansar-0.6 An Sar 2017-10-28 16:10:42 -07:00
  • 08ecdf8fa4 update mcp mappings, sync with changes in primal 0.6.x An Sar 2017-10-28 16:06:08 -07:00
  • b8e84dc824 update to client proxy registry Mohammad-Ali Minaie 2017-10-28 18:50:20 -04:00
  • 118ef3f90b Trying to add armor Mohammad-Ali Minaie 2017-10-25 19:37:34 -04:00
  • a79a372729 Merge branch 'tile-factory' of nmd/ForgeCraft into master-1.12 kitsu 2017-10-16 17:51:58 +00:00
  • 4203c42cb4 update to primal 0.6.x, version bump, increase forge to 1.12.2 An Sar 2017-10-05 20:42:12 -07:00
  • f5bd23682c updated lang file but lots of diff changes Mohammad-Ali Minaie 2017-10-04 13:48:23 -04:00
  • 6a0b872ebc not completing download of Primal 5.11 dependency Mohammad-Ali Minaie 2017-09-16 13:28:16 -04:00
  • f708ac25f5 version bump master Mohammad-Ali Minaie 2017-09-16 10:47:08 -04:00
  • 01834a6d77 fixed the API occorunces Mohammad-Ali Minaie 2017-09-16 10:45:49 -04:00