modmuss50
d84bffce46
Fix nanosaber
2016-06-05 20:37:22 +01:00
Prospector
b7e6e109aa
Nanosaber still don't work
2016-06-05 10:41:00 -07:00
Prospector
4c01fa8864
Started work on fixing nanosaber
2016-06-05 03:57:38 -07:00
Prospector
a719a1c563
Holy huge commit with unhelpful name batman!
...
-Added TRNoDestroy (for items that do not use JSONDestroyer)
-Batteries now use item overrides to display different texture when empty
-Fixed diamond nugget unity texture
-Removed new fluid sources from JEI
-Fixed empty cell lang entry
2016-06-05 01:33:40 -07:00
modmuss50
77eddc31b2
More lang for tool tips, closes #610
2016-06-04 11:40:52 +01:00
Yulife
1380724d10
Industrial Sawmill
2016-06-02 19:21:53 +02:00
Yulife
9cbebe6dbd
Shoo IC2 Exp, Shoo
2016-05-30 16:11:40 +02:00
Yulife
8b09c72255
s
2016-05-30 14:18:43 +02:00
Yulife
9f0298b9d5
Nugget Removal
2016-05-30 14:04:17 +02:00
Yulife
341e862e37
Bunch of new item textures, move Lazurite to plates
...
... and relocation of some assets
2016-05-30 13:37:27 +02:00
modmuss50
1fd58d8986
Improve matter fab
2016-05-28 19:33:17 +01:00
modmuss50
f39a047f49
Fixes #481 and Fixes empty cell texture
2016-05-25 17:23:19 +01:00
modmuss50
25ee0b5790
Remove old cells, now uses the DynamicCell, 9 new fluids that need a texture
2016-05-23 18:26:21 +01:00
Prospector
188e2ef0c5
Fix tool tiers
2016-05-23 00:13:11 -07:00
Prospector
be36455415
Rename to tungstenGrindingHead
2016-05-22 14:01:38 -07:00
modmuss50
a24ee95c4d
Fix crash when reloading texture
2016-05-22 21:20:39 +01:00
Yulife
4050076a81
Clean up, Missing dusts, no more ID shifting
2016-05-22 17:44:15 +02:00
Yulife
ab74f1c077
Remove Red Rock, implement new vanilla stones
2016-05-22 16:53:15 +02:00
modmuss50
161eb87246
Remove voidstone, does NOT break worlds
2016-05-22 14:53:56 +01:00
Prospector
8fffe67f17
Update to use new ChatUtils
2016-05-21 21:51:26 -07:00
modmuss50
e38c800f21
Added Universal Cell
2016-05-17 21:12:33 +01:00
modmuss50
7e2db4a715
Rewrote fluids
...
Now uses json files
Now uses forge bucket
Now not broken, closes #557
2016-05-17 18:36:51 +01:00
Prospector
3cf950d491
Shift-Right click on non-block to clear freq. transmitter and advanced drill/chainsaw recipes.
2016-05-15 21:24:35 -07:00
Prospector
4a05018849
Fix rockcutter
2016-05-15 15:03:13 -07:00
Prospector
2410b4852f
remove hot tungstensteel plate...who needs a hot plate anyway?
2016-05-14 22:54:18 -07:00
Prospector
36d736686b
Fix TRArmour texture caps
2016-05-14 14:58:09 -07:00
modmuss50
3dd6ca4697
Fix small dust textures
2016-05-13 11:07:56 +01:00
modmuss50
0dbae6a781
Fixes 3d person nano saber rendering
2016-05-13 08:35:02 +01:00
modmuss50
960bac8cc2
Fix Server Crash
2016-05-13 07:46:17 +01:00
modmuss50
b0fbd5aea0
Update to support removal of ic2 api
2016-05-12 19:16:40 +01:00
Prospector
934cc76089
Frequency Transmitters only stack to 1
2016-05-11 22:37:55 -07:00
Prospector
2f370d5637
Fix localizations and improve chat messages
2016-05-11 18:44:28 -07:00
Prospector
f746df428b
Frequency Transmitter works now
2016-05-10 22:35:09 -07:00
modmuss50
5ca379667d
fix building
2016-05-10 07:45:13 +01:00
Prospector
1bcc459865
Make pipes look fancier
2016-05-09 17:38:41 -07:00
modmuss50
9fa77d31d8
Fix forge fluid bucket rendering
2016-05-09 16:18:22 +01:00
modmuss50
caaa5a3e7f
Fix sounds
2016-05-08 11:42:59 +01:00
Prospector
2a367085e1
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-05-07 13:34:00 -07:00
Prospector
2b84fceef3
Remove vinteum dust
2016-05-07 13:33:14 -07:00
modmuss50
4095a0b52d
Auto update mappings
2016-05-06 22:13:24 +01:00
Prospector
44f2588b4e
Update JEI compat
2016-04-30 20:01:10 -07:00
Prospector
994d12a850
Remove lots of useless stuff (will break existing worlds)
2016-04-29 21:21:28 -07:00
Prospector
ab1a2910dd
Get rid of scrapbox code in freq. transmitter :P
2016-04-25 07:00:31 -07:00
modmuss50
b55c0a3c8e
Revert ItemParts.java, fix issue with ManualLoader
2016-04-24 21:07:56 +01:00
Prospector
d1ca1eaa74
Remove some crap
2016-04-24 10:57:44 -07:00
modmuss50
a2d626bc61
Fixes #523
2016-04-23 13:32:03 +01:00
modmuss50
ef133ab25b
Start on tile rewrite
2016-04-11 17:23:57 +01:00
modmuss50
510f969c94
Auto remove un needed things in the code
2016-04-03 14:34:39 +01:00
modmuss50
7e7fcf2ad9
Made the api usefull
2016-04-03 14:25:46 +01:00
modmuss50
df61729d6f
Some work on the new api
2016-04-03 14:07:45 +01:00
Prospector
77104b39ce
Recipe changes and DOGECOIN
2016-03-29 22:45:15 -07:00
Prospector
4af72aed00
Fix Transformer Upgrade Recipe
2016-03-29 17:43:35 -07:00
Stuart Pomeroy
02357ce1a4
Fix Tiles and Guis, closes #478 and closes #479
2016-03-29 20:27:23 +01:00
Modmuss50
918f1a0ed5
Merge remote-tracking branch 'origin/1.9' into 1.9
2016-03-29 11:19:49 +01:00
Modmuss50
57220526c0
Update for new json destroyer
2016-03-29 11:19:24 +01:00
Prospector
b06c454634
Upgrade recipes
2016-03-29 02:17:48 -07:00
Stuart Pomeroy
ad9f50110a
Auto stash for revert of "Closes #443 , #466 , #468 "
2016-03-29 10:00:23 +01:00
Stuart Pomeroy
4f9f98e1bd
Revert "Closes #443 , #466 , #468 "
...
This reverts commit faa6aa30d0
.
2016-03-29 09:58:32 +01:00
Stuart Pomeroy
faa6aa30d0
Closes #443 , #466 , #468
2016-03-29 09:58:07 +01:00
Stuart Pomeroy
43aca4d3f4
Merged branch 1.9 into 1.9
2016-03-29 09:43:30 +01:00
Stuart Pomeroy
3282677f02
Fix it so the packs charge things.
2016-03-29 09:43:07 +01:00
Modmuss50
1fa014c098
I may have broken a lot of recipes, can someone check? But it should fix #474
2016-03-29 09:36:00 +01:00
Prospector
58902f3901
Quite a bit of fixes/additions
2016-03-29 00:30:05 -07:00
Prospector
cec54aa0c8
Fix lots of issues
2016-03-28 19:47:00 -07:00
Prospector
620bbfc1df
Rework batteries
2016-03-28 16:02:39 -07:00
Stuart Pomeroy
816c92d6b1
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-03-28 21:43:53 +01:00
Stuart Pomeroy
a8ee636846
Work on the LapotronPack - Hitt forge bug.
2016-03-28 21:43:32 +01:00
gigabit101
1cfa5e79e7
more Recipes
2016-03-28 21:33:36 +01:00
gigabit101
5f4ae53c85
Added WIP to some Items
2016-03-28 18:38:09 +01:00
Stuart Pomeroy
d51a772979
Fix Wrenching, closes #418
2016-03-28 13:35:59 +01:00
Prospector
3df24a1831
Add tools/armour to creative tab
2016-03-28 01:26:54 -07:00
Prospector
a636da1882
Bronze Tools and Armour
2016-03-27 21:20:27 -07:00
Stuart Pomeroy
dfb7d0afd4
Fix Merges
2016-03-27 20:14:13 +01:00
Stuart Pomeroy
78e8acce7b
Fixed some GUIS and some Mass Fabs
2016-03-27 20:10:49 +01:00
gigabit101
33c8386324
Merge branch '1.9' of https://github.com/TechReborn/TechReborn into 1.9
2016-03-27 19:40:22 +01:00
gigabit101
d0289037dc
Added WIP tag to book
2016-03-27 19:40:10 +01:00
modmuss50
aeb567deb7
Fixes #416
2016-03-27 18:38:43 +01:00
Stuart Pomeroy
8fba82312c
Closes #402,#404,406
2016-03-27 17:41:56 +01:00
modmuss50
5eed5b161d
Code formatter take 2
2016-03-25 09:47:34 +00:00
modmuss50
33985f1a31
Revert "Added code formatter"
...
This reverts commit b9448d5d90
.
2016-03-24 00:41:47 +00:00
modmuss50
b9448d5d90
Added code formatter
2016-03-24 00:39:26 +00:00
gigabit101
bd37e8ad7f
3D Wrench
2016-03-23 17:05:21 +00:00
modmuss50
fffcecbb98
Revert "Removed bucket textures as it now generates them at runtime"
...
This reverts commit 4585684fe2
.
2016-03-23 11:37:30 +00:00
modmuss50
d66c2e8301
Added debug items
2016-03-20 16:43:25 +00:00
gigabit101
24c806d68a
Some texture fix's
2016-03-20 15:39:25 +00:00
gigabit101
f3016ed07d
Some recipes
2016-03-20 15:28:40 +00:00
modmuss50
e319398bc9
Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
2016-03-16 17:09:34 +00:00
modmuss50
51539f4ec8
Remove item transformers
2016-03-16 17:04:19 +00:00
modmuss50
8c24711d4f
Optimise imports
2016-03-15 08:13:05 +00:00
modmuss50
54c7827bb2
Fixes subitem rendering
2016-03-14 13:28:33 +00:00
modmuss50
32f25a0141
Its gets to main menu
2016-03-13 18:38:41 +00:00
modmuss50
cc0b762b56
87 errors, will finish later
2016-03-13 17:38:12 +00:00
modmuss50
b4a16c03ed
And 50 more errors fixed
2016-03-13 16:15:27 +00:00
modmuss50
9a40abbe78
Now comes the grind, 244 errors left
2016-03-13 16:08:30 +00:00
modmuss50
7f920b282f
Optimise imports to make it easier to find and replace package names
2016-03-13 15:37:55 +00:00
gigabit101
4516b9023f
Nanosaber on/off state is now NBT
2016-03-09 15:03:26 +00:00
TheDoctorSoda
29c43ddd99
Fix thermal generator texture and adjust nanosaber speed
2016-03-07 20:47:40 -08:00
modmuss50
67526480ad
Added walia support for the cables
2016-03-07 20:33:08 +00:00
TheDoctorSoda
38af4881b4
Started nanosaber, needs work but wanted to get the item in.
2016-03-06 23:01:02 -08:00
TheDoctorSoda
a379360ef5
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-03-06 18:37:25 -08:00
TheDoctorSoda
c19b792960
[TEXTURES] Cables and refined iron
2016-03-06 18:37:10 -08:00
gigabit101
77e2edc005
More work on recycler
2016-03-07 00:21:22 +00:00
gigabit101
02ac62a180
Started Recycler
2016-03-06 23:15:28 +00:00
modmuss50
f4d74f7486
Wrench crash fix, cable drop items, cables have hardness
2016-03-06 15:02:17 +00:00
gigabit101
f1cbfc471b
set wrench stack size to 1
2016-03-05 22:56:52 +00:00
gigabit101
3302d63385
Added lapatron and energy crystals
2016-03-05 22:50:39 +00:00
gigabit101
694aae55ff
some recipe things
2016-03-05 19:42:22 +00:00
modmuss50
5e82463330
Initial port of cables from kotlin
2016-03-02 16:29:51 +00:00
gigabit101
c5dabec844
Note for @modmuss50
2016-03-01 16:33:33 +00:00
gigabit101
65266317b3
Cable types
2016-03-01 16:32:06 +00:00
gigabit101
2e10f10197
closes #368
2016-03-01 16:13:53 +00:00
modmuss50
b0cb4f87c5
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
...
# Conflicts:
# src/main/java/techreborn/items/tools/ItemWrench.java
2016-02-29 08:15:23 +00:00
TheDoctorSoda
2a83a982c3
A few plate textures
2016-02-28 13:22:06 -08:00
TheDoctorSoda
9e5f223a42
Added jackhammers
2016-02-28 11:18:59 -08:00
TheDoctorSoda
02ff95c60c
Changed hammer sound to lower pitched wrench sound
2016-02-27 22:22:27 -08:00
TheDoctorSoda
34046e9ef4
Chainsaws effective on leaves, and are affected by unbreaking enchantment, along with the drills
2016-02-27 22:00:22 -08:00
TheDoctorSoda
74caaf6bd6
Made chainsaws share code
2016-02-27 16:49:50 -08:00
modmuss50
e4b8918224
More work on the cables, and add items
2016-02-27 19:36:01 +00:00
modmuss50
52b248ceab
Some changes to the wrench
2016-02-27 09:15:14 +00:00
TheDoctorSoda
a212e465dc
Hammer plays anvil sound
2016-02-26 20:11:29 -08:00
modmuss50
e8539eadd3
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-26 21:47:16 +00:00
modmuss50
9507c92d94
Added wrench
2016-02-26 21:46:55 +00:00
gigabit101
6549282ea0
Cleaned up imports
2016-02-26 13:03:30 +00:00
TheDoctorSoda
b68647ffa0
[TEXTURES] Manual update
2016-02-25 19:32:33 -08:00
TheDoctorSoda
2f03b20bea
Fix chainsaws extending Pickaxe not Axe
2016-02-25 19:01:02 -08:00
TheDoctorSoda
6978e14652
Actually add chainsaws (last commit was a lie)
2016-02-25 17:42:45 -08:00
TheDoctorSoda
4efb322ccd
Fix drill tier and charge configs and add chainsaws
2016-02-25 17:42:24 -08:00
modmuss50
efbf4c59bb
Added a load of new parts
2016-02-25 18:37:29 +00:00
modmuss50
9a1136fe25
Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9
2016-02-25 18:28:20 +00:00
modmuss50
a8cf7fbb87
Added lava and water cells
2016-02-25 18:28:13 +00:00
gigabit101
82d2de7eb1
Start on the new manual
2016-02-25 18:25:52 +00:00
gigabit101
3274894625
Added hammer and some basic plate recipes
2016-02-25 14:16:08 +00:00
modmuss50
46cdf8f587
Fixes to configs, optimise imports.
2016-02-24 08:18:21 +00:00
TheDoctorSoda
571e1aa033
Fix iron shovel mining speed for drill
2016-02-21 15:02:05 -08:00
TheDoctorSoda
1a9c2fd3d5
Drill textures
2016-02-21 14:18:25 -08:00
TheDoctorSoda
b643162dad
Fix rubber log texture names and fix treetap texture
2016-02-21 13:32:03 -08:00
modmuss50
c06a98422d
Added scrap item, utilise some new textures.
2016-02-21 13:49:49 +00:00
gigabit101
ba5019867e
Drill tweaks
2016-02-20 23:19:06 +00:00
gigabit101
b613b1e419
Drills
2016-02-20 23:04:32 +00:00
modmuss50
c5393d3f2b
Added sound effect for sap
2016-02-20 22:56:58 +00:00
gigabit101
0522e9539f
Added some textures
...
Added Tree Tap
Added Tree Tap logic
2016-02-20 22:50:24 +00:00
modmuss50
71c2bfee7f
Moved power system to RC and spawn trees in groups
2016-02-20 16:59:31 +00:00
gigabit101
f947ef37a4
Added basic battery and fixed issues with Lithium Battery
2016-02-20 03:35:20 +00:00
modmuss50
cfab240ac7
Added some more items
2016-02-20 01:32:08 +00:00
gigabit101
464d8cac03
Added advancedCircuit and Circuit
2016-02-20 01:08:18 +00:00
gigabit101
8ad4a45716
Added basic Grinder
2016-02-20 00:57:57 +00:00
modmuss50
9268fa4d55
1117 lines of new recipes?
...
Added a new recipe manager to allow us to list the missing items that need to be reimplemented.
2016-02-19 20:32:26 +00:00
modmuss50
9a585bcfb2
Merge branch '1.7.10' into 1.8.9
...
Conflicts:
build.gradle
src/main/java/techreborn/blocks/BlockOre.java
src/main/java/techreborn/items/ItemCells.java
2016-02-16 13:49:25 +00:00
modmuss50
25777b3f96
Fixes #217
2016-02-16 10:00:03 +00:00
modmuss50
8ec95f9119
Now using new Forge Dynamic buckets, and prep for new update
2016-02-02 21:05:42 +00:00