Mohammad-Ali Minaie
|
1a764219be
|
updating merge from master and updating dependencies
|
2019-07-16 00:42:28 -04:00 |
|
Mohammad-Ali Minaie
|
d1a1dc3fe1
|
merging master branch into feature branch
|
2019-07-15 23:07:48 -04:00 |
|
Mohammad-Ali Minaie
|
a341f1677a
|
updating version to make sense
|
2019-07-15 22:17:35 -04:00 |
|
|
|
295e556867
|
Sync'd maven repositories
|
2019-06-13 14:13:32 -05:00 |
|
Mohammad-Ali Minaie
|
d74f564d8e
|
modify props
|
2019-06-10 15:22:22 -04:00 |
|
Mohammad-Ali Minaie
|
cbe15662e3
|
fixed bug with jei crashing when hovering over tool or weapon parts
|
2019-06-09 15:09:33 -04:00 |
|
Mohammad-Ali Minaie
|
bad57bdb6b
|
update version
|
2019-06-08 15:53:27 -04:00 |
|
Mohammad-Ali Minaie
|
5ada5951bf
|
fixing bug with moved crucibles and broken textures
|
2019-06-08 15:52:20 -04:00 |
|
Mohammad-Ali Minaie
|
a7f3b0b5ab
|
adding russian lang file
|
2019-02-25 18:35:16 -05:00 |
|
Mohammad-Ali Minaie
|
ab42ba9f30
|
updating tooltip printout to print properly
|
2019-01-28 12:42:05 -05:00 |
|
Mohammad-Ali Minaie
|
6c467978fc
|
version bump plus print out removal
|
2018-12-16 17:44:49 -05:00 |
|
Mohammad-Ali Minaie
|
f7c27289b7
|
update feature branch
|
2018-12-16 17:15:16 -05:00 |
|
Mohammad-Ali Minaie
|
9a8fe16df4
|
create saw assets and saw recipes
|
2018-11-25 19:27:49 -05:00 |
|
Mohammad-Ali Minaie
|
0752fecfdc
|
update engine model and mechanics, rotations for axles match appriate K value
|
2018-11-17 14:02:09 -05:00 |
|
Mohammad-Ali Minaie
|
5369a9fef1
|
redstone engines work, gearboxes work, creating tools as well as torque and speed calculations
|
2018-11-12 17:22:33 -05:00 |
|
Mohammad-Ali Minaie
|
3191711b09
|
updating feature branch
|
2018-11-11 21:57:09 -05:00 |
|
Mohammad-Ali Minaie
|
4e30ec7f20
|
create model for redstone bellows, started animations need to do arm actuation animations
|
2018-11-04 01:51:25 -04:00 |
|
Mohammad-Ali Minaie
|
5a203384d8
|
animationStateManager update refactor some packages
|
2018-11-02 21:40:33 -04:00 |
|
Mohammad-Ali Minaie
|
f3cccdc613
|
fixed cauldron recipe and updated lang file
|
2018-10-31 17:29:43 -04:00 |
|
Mohammad-Ali Minaie
|
fdc65afa5d
|
update
|
2018-10-29 16:26:26 -04:00 |
|
Mohammad-Ali Minaie
|
ce398ba90c
|
fixed rendering and NBT crash with old weapons
|
2018-10-29 07:27:51 -04:00 |
|
Mohammad-Ali Minaie
|
69b0435cc3
|
sharpening and weapon upgrading
|
2018-10-28 14:57:33 -04:00 |
|
Mohammad-Ali Minaie
|
5d52195bda
|
more Grinding bench stuff
|
2018-10-28 10:55:46 -04:00 |
|
Mohammad-Ali Minaie
|
25ba3af7c6
|
fixed merge conflict from master
|
2018-10-27 16:26:09 -04:00 |
|
Mohammad-Ali Minaie
|
94ed0367aa
|
fixed some small render bugs
|
2018-10-27 16:25:03 -04:00 |
|
Mohammad-Ali Minaie
|
51561d063e
|
update with merge conflict resolved
|
2018-10-27 15:28:36 -04:00 |
|
Mohammad-Ali Minaie
|
8fda4b25c4
|
update to crucible, should be fixed now
|
2018-10-26 23:26:33 -04:00 |
|
Mohammad-Ali Minaie
|
5ef2b3bd0d
|
update before switch to master
|
2018-10-26 17:19:44 -04:00 |
|
Mohammad-Ali Minaie
|
7afe86e45e
|
Merge branch 'master-1.12' into feature-1.12
|
2018-10-25 22:18:12 -04:00 |
|
Mohammad-Ali Minaie
|
69f25c4d0c
|
fixed nbt crucible item adding bug
|
2018-10-25 22:17:49 -04:00 |
|
Mohammad-Ali Minaie
|
4260b1169c
|
secret
|
2018-10-25 20:36:34 -04:00 |
|
Mohammad-Ali Minaie
|
b6cbeac459
|
updating toolbench weapon upgrade feature
|
2018-10-25 01:14:37 -04:00 |
|
Mohammad-Ali Minaie
|
d4881ea454
|
Merge branch 'master-1.12' into feature-1.12
|
2018-10-22 08:07:19 -04:00 |
|
Mohammad-Ali Minaie
|
d83adf0323
|
pushing fix to casting
|
2018-10-22 08:06:53 -04:00 |
|
Mohammad-Ali Minaie
|
324bba66c1
|
bugfixed in feature again
|
2018-10-22 06:43:36 -04:00 |
|
Mohammad-Ali Minaie
|
908c5150e5
|
update weapon crafting
|
2018-10-22 06:12:50 -04:00 |
|
Mohammad-Ali Minaie
|
eb429a5fc2
|
trying to fix merge conflixt
|
2018-10-20 19:49:32 -04:00 |
|
Mohammad-Ali Minaie
|
b7aba91158
|
somehow files got sent to master instead of feature
|
2018-10-20 19:47:27 -04:00 |
|
Mohammad-Ali Minaie
|
51d3bb7df3
|
trying to push new files
|
2018-10-20 18:17:53 -04:00 |
|
Mohammad-Ali Minaie
|
8a4f6f6dda
|
made chisel placement better
|
2018-10-20 17:19:51 -04:00 |
|
Mohammad-Ali Minaie
|
fec851e5af
|
fixed a bug but in the wrong branch
|
2018-10-20 11:06:35 -04:00 |
|
Mohammad-Ali Minaie
|
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
|
2018-10-19 08:03:59 -04:00 |
|
Mohammad-Ali Minaie
|
b390ac48be
|
Merge branch 'master-1.12' into feature-1.12
|
2018-10-18 20:01:05 -04:00 |
|
Mohammad-Ali Minaie
|
0e785eff57
|
bugfix for chisel
|
2018-10-18 20:00:00 -04:00 |
|
Mohammad-Ali Minaie
|
b7f3d04929
|
need saw and blade recipes to make weapon hilts and guards
|
2018-10-18 18:39:11 -04:00 |
|
Mohammad-Ali Minaie
|
dbc591fc59
|
created raw gladius for all material types and abstracted recipe creator, need wither dust in PC
|
2018-10-17 22:08:04 -04:00 |
|
Mohammad-Ali Minaie
|
0efd2b73fd
|
weapon upgrades baby
|
2018-10-16 21:47:13 -04:00 |
|
Mohammad-Ali Minaie
|
3d8552ed1a
|
trying to match inputs
|
2018-10-16 10:58:47 -04:00 |
|
Mohammad-Ali Minaie
|
eecd4536ce
|
fixed the toolbench recipes and recipe to craft it
|
2018-10-15 16:53:12 -04:00 |
|
Mohammad-Ali Minaie
|
a822458bc2
|
upadting the longbow to work more like and render more like a vanilla bow
|
2018-10-15 16:11:16 -04:00 |
|
