Commit Graph

  • 71a706dfab Russian Language updates master-1.12 kitsu 2022-09-10 21:15:02 +00:00
  • 1a764219be updating merge from master and updating dependencies feature-1.12 Mohammad-Ali Minaie 2019-07-16 00:42:28 -04:00
  • d1a1dc3fe1 merging master branch into feature branch Mohammad-Ali Minaie 2019-07-15 23:07:48 -04:00
  • 3cb82b5e4c updating version Mohammad-Ali Minaie 2019-07-15 22:19:28 -04:00
  • a341f1677a updating version to make sense Mohammad-Ali Minaie 2019-07-15 22:17:35 -04:00
  • 312bcb82bd Version Bump cScot 2019-06-14 12:09:40 -05:00
  • 295e556867 Sync'd maven repositories cScot 2019-06-13 14:13:32 -05:00
  • d74f564d8e modify props Mohammad-Ali Minaie 2019-06-10 15:22:22 -04:00
  • cbe15662e3 fixed bug with jei crashing when hovering over tool or weapon parts Mohammad-Ali Minaie 2019-06-09 15:09:33 -04:00
  • bad57bdb6b update version Mohammad-Ali Minaie 2019-06-08 15:53:27 -04:00
  • 5ada5951bf fixing bug with moved crucibles and broken textures Mohammad-Ali Minaie 2019-06-08 15:52:20 -04:00
  • a7f3b0b5ab adding russian lang file Mohammad-Ali Minaie 2019-02-25 18:35:16 -05:00
  • ab42ba9f30 updating tooltip printout to print properly Mohammad-Ali Minaie 2019-01-28 12:42:05 -05:00
  • 6c467978fc version bump plus print out removal Mohammad-Ali Minaie 2018-12-16 17:44:49 -05:00
  • f7c27289b7 update feature branch Mohammad-Ali Minaie 2018-12-16 17:15:16 -05:00
  • 9a8fe16df4 create saw assets and saw recipes Mohammad-Ali Minaie 2018-11-25 19:27:49 -05:00
  • 0752fecfdc update engine model and mechanics, rotations for axles match appriate K value Mohammad-Ali Minaie 2018-11-17 14:02:09 -05:00
  • 5369a9fef1 redstone engines work, gearboxes work, creating tools as well as torque and speed calculations Mohammad-Ali Minaie 2018-11-12 17:22:33 -05:00
  • 3191711b09 updating feature branch Mohammad-Ali Minaie 2018-11-11 21:57:09 -05:00
  • 4e30ec7f20 create model for redstone bellows, started animations need to do arm actuation animations Mohammad-Ali Minaie 2018-11-04 01:51:25 -04:00
  • 88b60140d6 updating master with new script Mohammad-Ali Minaie 2018-11-02 22:06:16 -04:00
  • 1bfb6902de fixed getting the current branch in the push script Mohammad-Ali Minaie 2018-11-02 22:05:13 -04:00
  • 8af16328fb testing new script Mohammad-Ali Minaie 2018-11-02 22:03:28 -04:00
  • 5a203384d8 animationStateManager update refactor some packages Mohammad-Ali Minaie 2018-11-02 21:40:33 -04:00
  • f3cccdc613 fixed cauldron recipe and updated lang file Mohammad-Ali Minaie 2018-10-31 17:29:43 -04:00
  • fdc65afa5d update Mohammad-Ali Minaie 2018-10-29 16:26:26 -04:00
  • ce398ba90c fixed rendering and NBT crash with old weapons Mohammad-Ali Minaie 2018-10-29 07:27:51 -04:00
  • 69b0435cc3 sharpening and weapon upgrading Mohammad-Ali Minaie 2018-10-28 14:57:33 -04:00
  • 5d52195bda more Grinding bench stuff Mohammad-Ali Minaie 2018-10-28 10:55:46 -04:00
  • 25ba3af7c6 fixed merge conflict from master Mohammad-Ali Minaie 2018-10-27 16:26:09 -04:00
  • 94ed0367aa fixed some small render bugs Mohammad-Ali Minaie 2018-10-27 16:25:03 -04:00
  • 51561d063e update with merge conflict resolved Mohammad-Ali Minaie 2018-10-27 15:28:36 -04:00
  • 8fda4b25c4 update to crucible, should be fixed now Mohammad-Ali Minaie 2018-10-26 23:26:33 -04:00
  • 5ef2b3bd0d update before switch to master Mohammad-Ali Minaie 2018-10-26 17:19:44 -04:00
  • 7afe86e45e Merge branch 'master-1.12' into feature-1.12 Mohammad-Ali Minaie 2018-10-25 22:18:12 -04:00
  • 69f25c4d0c fixed nbt crucible item adding bug Mohammad-Ali Minaie 2018-10-25 22:17:49 -04:00
  • 4260b1169c secret Mohammad-Ali Minaie 2018-10-25 20:36:34 -04:00
  • b6cbeac459 updating toolbench weapon upgrade feature Mohammad-Ali Minaie 2018-10-25 01:14:37 -04:00
  • 195e046bb8 Merge branch 'master-1.12' into bugfix-1.12 bugfix-1.12 Mohammad-Ali Minaie 2018-10-22 08:18:09 -04:00
  • 29b314486a pushing up bugfix Mohammad-Ali Minaie 2018-10-22 08:17:52 -04:00
  • d4881ea454 Merge branch 'master-1.12' into feature-1.12 Mohammad-Ali Minaie 2018-10-22 08:07:19 -04:00
  • d83adf0323 pushing fix to casting Mohammad-Ali Minaie 2018-10-22 08:06:53 -04:00
  • 324bba66c1 bugfixed in feature again Mohammad-Ali Minaie 2018-10-22 06:43:36 -04:00
  • 908c5150e5 update weapon crafting Mohammad-Ali Minaie 2018-10-22 06:12:50 -04:00
  • eb429a5fc2 trying to fix merge conflixt Mohammad-Ali Minaie 2018-10-20 19:49:32 -04:00
  • b7aba91158 somehow files got sent to master instead of feature Mohammad-Ali Minaie 2018-10-20 19:47:27 -04:00
  • 51d3bb7df3 trying to push new files Mohammad-Ali Minaie 2018-10-20 18:17:53 -04:00
  • 8a4f6f6dda made chisel placement better Mohammad-Ali Minaie 2018-10-20 17:19:51 -04:00
  • fec851e5af fixed a bug but in the wrong branch Mohammad-Ali Minaie 2018-10-20 11:06:35 -04:00
  • 2b9f131984 created bone handle and bone guard items as well as workbench recipes to create the finised item, need to check if the NBT transfers correctly Mohammad-Ali Minaie 2018-10-19 08:03:59 -04:00
  • b390ac48be Merge branch 'master-1.12' into feature-1.12 Mohammad-Ali Minaie 2018-10-18 20:01:05 -04:00
  • 0e785eff57 bugfix for chisel Mohammad-Ali Minaie 2018-10-18 20:00:00 -04:00
  • b7f3d04929 need saw and blade recipes to make weapon hilts and guards Mohammad-Ali Minaie 2018-10-18 18:39:11 -04:00
  • dbc591fc59 created raw gladius for all material types and abstracted recipe creator, need wither dust in PC Mohammad-Ali Minaie 2018-10-17 22:08:04 -04:00
  • 0efd2b73fd weapon upgrades baby Mohammad-Ali Minaie 2018-10-16 21:47:13 -04:00
  • 3d8552ed1a trying to match inputs Mohammad-Ali Minaie 2018-10-16 10:58:47 -04:00
  • eecd4536ce fixed the toolbench recipes and recipe to craft it Mohammad-Ali Minaie 2018-10-15 16:53:12 -04:00
  • a822458bc2 upadting the longbow to work more like and render more like a vanilla bow Mohammad-Ali Minaie 2018-10-15 16:11:16 -04:00
  • 8b09d55bd0 updating workspace before new changes Mohammad-Ali Minaie 2018-10-15 08:47:06 -04:00
  • 25cf6c6704 something is wrong with my classpath for blocks Mohammad-Ali Minaie 2018-10-14 13:40:02 -04:00
  • dbc09ae0b3 getting no class def error Mohammad-Ali Minaie 2018-10-14 12:34:08 -04:00
  • 1d45f17f21 changed the printout statements for the bloomery and fixed a dupe bug with damascus Mohammad-Ali Minaie 2018-10-09 19:16:12 -04:00
  • f606675101 remove damascus config update to-dos released .22 Mohammad-Ali Minaie 2018-10-08 22:49:54 -04:00
  • 03d0724cd2 finizhed chisel and sledgehammer feature plus fixed some bugs Mohammad-Ali Minaie 2018-10-06 18:55:02 -04:00
  • 14fc81e64b update code, missing my CrucibleRecipes class... Mohammad-Ali Minaie 2018-10-06 14:21:45 -04:00
  • 69ab05bc18 need to add bounding for chisel, chisel and sledgehammer crafting, chisel and sledgehammer asset updates Mohammad-Ali Minaie 2018-10-06 02:38:22 -04:00
  • 51eaa9eaeb more work on the chisel and hammer feature Mohammad-Ali Minaie 2018-10-05 23:52:12 -04:00
  • ad02317dcd hammer and chisel working like i want, chisel needs directional, and hitting sounds, need rock crumbling sounds, Mohammad-Ali Minaie 2018-10-04 17:01:20 -04:00
  • f5f00fd2e7 updated enchantment remove logic and created models for chisel and sledgehammer Mohammad-Ali Minaie 2018-10-03 17:39:12 -04:00
  • 3173246104 updated versions Mohammad-Ali Minaie 2018-10-03 14:11:50 -04:00
  • e5ce106785 CT support for crucible recipes Mohammad-Ali Minaie 2018-10-02 22:24:23 -04:00
  • 0b16ea1138 updating with current code Mohammad-Ali Minaie 2018-10-02 19:10:03 -04:00
  • bf125d564f update with new code Mohammad-Ali Minaie 2018-10-02 17:31:53 -04:00
  • 0b1fac7b05 pushing working CT code and recipe code for the crucible but its not updated JEI with new recipes Mohammad-Ali Minaie 2018-10-02 17:02:51 -04:00
  • 1b2ca345ce CT is working except add recipes Mohammad-Ali Minaie 2018-10-02 03:27:30 -04:00
  • 2ef0a38a8c Merge branch 'feature-1.12' of ssh://git.nmd.so:12000/nmd/ForgeCraft into master-1.12 Mohammad-Ali Minaie 2018-10-02 01:38:16 -04:00
  • eff6124c2a fking lang file Mohammad-Ali Minaie 2018-10-02 01:04:11 -04:00
  • 725186d1a6 renamed crap Mohammad-Ali Minaie 2018-10-02 00:31:48 -04:00
  • 1a9b83059a checking these damn recipes Mohammad-Ali Minaie 2018-10-02 00:27:23 -04:00
  • 3c9d80b139 version bump Mohammad-Ali Minaie 2018-10-01 23:07:38 -04:00
  • 93b7f9f82c working CT redoing all recipe handlers, woo.... Mohammad-Ali Minaie 2018-10-01 23:00:30 -04:00
  • 369e02712d push fixes and version updates Mohammad-Ali Minaie 2018-10-01 18:19:27 -04:00
  • 2f0c56c0eb update todos Mohammad-Ali Minaie 2018-10-01 06:44:43 -04:00
  • 2faa718deb tools range upgrades from 1-5 longbow fixed, reduced forge light level, forge really cools down now, chunks dont read upgrades, casting form works, anvil can cool down items stored in its inventory, Mohammad-Ali Minaie 2018-09-30 14:30:47 -04:00
  • c765542d6a Forge Light level reduce, forge cools down, ingots dont need to read upgrades, casting form fixed, anvil now cools its inventory, longbow arrow velocity balanced, more bucket crafting, config, copper tools, config for lowering fortune multiplier need to finish copper tool and tool head assets Mohammad-Ali Minaie 2018-09-28 02:04:01 -04:00
  • a77e2637ee working on fixing so many things Mohammad-Ali Minaie 2018-09-27 15:57:37 -04:00
  • 2c0c89f91b fixed forge lighting being to bright and updated to-do list Mohammad-Ali Minaie 2018-09-26 09:38:34 -04:00
  • d7c4e390ea fixing forge Mohammad-Ali Minaie 2018-09-25 12:44:29 -04:00
  • e5fe677771 update todos Mohammad-Ali Minaie 2018-09-25 09:04:40 -04:00
  • 8fc8dd32c2 fixed bugs Mohammad-Ali Minaie 2018-09-25 07:52:42 -04:00
  • 73a9bef667 updated and pulled back mcpMappings Mohammad-Ali Minaie 2018-09-23 20:42:50 -04:00
  • 432239c820 updated updating capability Mohammad-Ali Minaie 2018-09-23 16:57:35 -04:00
  • 91ea728d3b trying to fix capabilities Mohammad-Ali Minaie 2018-09-23 16:24:58 -04:00
  • 4818efe33c working on capabilities optimized imports Mohammad-Ali Minaie 2018-09-23 12:21:57 -04:00
  • 8dc5089de3 update tool parte Mohammad-Ali Minaie 2018-09-23 00:02:03 -04:00
  • b6c42230fe tongs are functional but rendering is jacked Mohammad-Ali Minaie 2018-09-22 22:08:37 -04:00
  • a06c4ce4ba workign through issues in the ForgeHandler Mohammad-Ali Minaie 2018-09-22 20:52:36 -04:00
  • 10e5e3d537 trying to get this damn handler to work Mohammad-Ali Minaie 2018-09-22 20:10:45 -04:00
  • d5c64228ca adding capability to the tongs Mohammad-Ali Minaie 2018-09-22 18:28:24 -04:00
  • 0d1cbbaf95 trying to fix the forge Mohammad-Ali Minaie 2018-09-22 15:41:06 -04:00