maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3012 commits 1 branch 0 tags 80 MiB
Commit graph

397 commits

Author SHA1 Message Date
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
modmuss50
7e7ad74203 Squashed commit of the following: 
commit 00d9c08c78680aba0310febfce5f42ccdb873eb6
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:38:27 2016 +0000

    Rename to fix spelling issue

commit cf780e5f6dc548b64da8e4e2f24f38377b692c5c
Author: modmuss50 <modmuss50@gmail.com>
Date:   Fri Jan 22 13:27:15 2016 +0000

    Update to new JSON-Destoryer version

commit ef3c8636242a54787d53cef9dda373818030d991
Author: modmuss50 <modmuss50@gmail.com>
Date:   Wed Jan 20 17:27:41 2016 +0000

    Update to new json destroyer
 2016-01-22 13:39:20 +00:00
modmuss50
43768b9310 Fix bucket issues 2016-01-16 15:54:41 +00:00
Modmuss50
f17cd36815 Update merged commits to 1.8.8 2015-12-16 17:13:17 +00:00
Modmuss50
0fdba82490 Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 
# Conflicts:
#	src/main/java/techreborn/compat/CompatManager.java
 2015-12-16 17:10:25 +00:00
Modmuss50
0c80f2beda More recipes, work on #182 2015-12-16 16:40:47 +00:00
Modmuss50
7c48afa63c Merge remote-tracking branch 'remotes/origin/master' into 1.8.8 2015-12-14 17:47:28 +00:00
Modmuss50
6df6dbfdf5 Fixes #300 2015-12-14 17:45:06 +00:00
modmuss50
20af49394f Fluid rendering, no more wasted block states 2015-12-05 19:37:42 +00:00
modmuss50
0d4b9afd01 All Items now have textures 2015-11-27 20:17:12 +00:00
Modmuss50
285176e171 Large handfull of textures. 2015-11-26 21:48:30 +00:00
Modmuss50
f12725b4e0 Fixed charge hud, and clocking device. 2015-11-25 08:28:28 +00:00
Modmuss50
d56e6752c0 A lot of stuff looks better now 2015-11-24 22:58:18 +00:00
Modmuss50
0bb1375823 Added cell rendering 2015-11-24 21:39:22 +00:00
Modmuss50
51d07ac8f5 571 2015-11-23 20:03:07 +00:00
Modmuss50
30879a534a 859 2015-11-23 19:19:18 +00:00
Modmuss50
b88fe49ee2 1936 2015-11-23 18:41:29 +00:00
Modmuss50
f0a70fa478 5235 2015-11-23 14:40:30 +00:00
Modmuss50
7e07320844 Removed unused imports 2015-11-12 19:50:20 +00:00
Modmuss50
faa1d079cd Added a handfull of recipes for #182 2015-11-11 11:21:10 +00:00
modmuss50
d4222693c0 Cleaned up Item Power System 2015-11-08 13:59:36 +00:00
modmuss50
8abf6e5282 Moved to RebornCore 2015-11-08 12:15:45 +00:00
modmuss50
dedb00aa7e Fixed console spam 2015-11-01 16:31:13 +00:00
modmuss50
1342eb90cf Fixes #216 2015-11-01 14:36:44 +00:00
modmuss50
cf34fe1f1f Large improvement to power system, fixes #204 2015-10-25 09:58:57 +00:00
modmuss50
50fa2e8a1d Fixes #194 2015-10-22 18:19:05 +01:00
Modmuss50
9d824e76ca Most of the stuff uses the new item power net now 2015-10-14 21:37:21 +01:00
Modmuss50
531315e55f Move cloaking device to new power system, fix some issues with it. 2015-10-14 21:08:34 +01:00
gigabit101
a8ea0f55e7 Removed a load of un needed junk from other versions of Gtech 2015-10-09 21:55:54 +01:00
gigabit101
5a230b20a2 Fix's #185 2015-10-09 21:10:20 +01:00
Modmuss50
081f16a533 Removed Farm 2015-09-23 18:58:46 +01:00
Modmuss50
3f4b59faaf Fixes #130 2015-09-23 17:27:41 +01:00
Modmuss50
c424e74473 closes #146 2015-09-16 08:24:58 +01:00
Modmuss50
2cf90af757 Fixed #140 2015-09-10 17:41:59 +01:00
modmuss50
8c421d20dd Some small tweaks to the cloaking device 2015-08-14 00:28:28 +01:00
primetoxinz
199bbf28b6 Finished Cloaking Device 2015-08-13 18:46:01 -04:00
modmuss50
e0ab0af822 Reformatted all the code using the default intelji formatting options. 2015-08-09 11:05:32 +01:00
modmuss50
9e346e6061 Added machine parts, added some recipes. Fixes #92 2015-08-05 15:35:06 +01:00
gigabit101
4c2c69f84e Added cloaking device {WIP} 2015-08-04 21:12:27 +01:00
modmuss50
1d6504c7ba Revert "Small re-factor to the RecipeRemover" 
This reverts commit 9c94b045b3.
 2015-08-04 10:31:41 +01:00
modmuss50
9c94b045b3 Small re-factor to the RecipeRemover 2015-07-27 19:40:00 +01:00
modmuss50
b9d880abe2 Fixed the silk touch issue again 2015-07-27 19:28:52 +01:00
modmuss50
b1682a64bd Fixes #90 2015-07-26 16:13:29 +01:00
modmuss50
f433aa706a Fixed crashing when ic2 is not installed 2015-07-26 15:35:02 +01:00
modmuss50
26f63e04f7 some small changes 2015-07-25 17:11:03 +01:00
modmuss50
c869e1656c Removed ic2 core dependency, should now only need to use the api 2015-07-25 16:37:11 +01:00
modmuss50
8725c5932d It now gets to the main menu without ic2 :) o/ Next I need to fix the powered items. 2015-07-23 16:19:07 +01:00
modmuss50
c160abf176 Started work on the farm, some changes to the idsu, its still broken 2015-07-13 13:54:44 +01:00
modmuss50
4ae1293535 Optimised all imports 2015-07-02 19:51:24 +01:00
joflashstudios
40c01c18a0 Added more Electrolyzer recipes 
I can't get the sand --> silicone recipe to take more than 1 block of sand. Help would be appreciated.
 2015-06-27 18:12:36 -04:00
joflashstudios
10837c46ff Added a few template electrolyzer recipes 2015-06-27 03:28:16 -04:00
modmuss50
0b3736f639 fixes #51 2015-06-26 08:17:02 +01:00
joflashstudios
c15302a789 Cleaned up and automated some recipe stuff 
Correct recipes to and from storage blocks are now available. The old wrong ones still need to be removed (e.g. sapphires to chrome block.)
 2015-06-26 02:09:45 -04:00
joflashstudios
11d4345ee7 Renamed to ItemDustTiny for consistancy 
Renamed to ItemDustsTiny
 2015-06-25 20:04:08 -04:00
joflashstudios
33b274ca68 Updated getByName functions 
Made comparison case insensitive
 2015-06-25 19:16:26 -04:00
joflashstudios
0f6747f703 Updated getByName functions 
Added storage block functions
Fixed a bunch of getX() typeos
 2015-06-25 18:41:29 -04:00
modmuss50
8058867eb1 Deprecated the item cells class, it now returns the ic2 version instead of the tr one for recipes 2015-06-19 19:01:38 +01:00
Gig
0b43eca49a Removed Gravity Chestplate not needed in this mod anymore 2015-06-14 17:11:18 +01:00
Gig
b0b2f4e6eb Small changes to RockCutter 2015-06-14 12:56:08 +01:00
Universal
600293b0e8 Made destructopack work 
Missed two files...
 2015-06-14 01:21:03 +02:00
Tntrololol
a6fcd15082 Added item for saw dust 2015-06-12 18:49:32 -05:00
modmuss50
92b95b9ff0 added some fixes, added documentation 2015-06-09 13:29:17 +01:00
modmuss50
6826cfe4be added unrest upgradeHandler 2015-06-09 11:24:15 +01:00
joflashstudios
2f59ca1b84 Added computercube and lapotronic energy orb 2015-06-07 15:55:23 -04:00
joflashstudios
9fa01eaee2 Added helpers for the rest of the item types 2015-06-07 00:36:37 -04:00
joflashstudios
e00ba942f8 Created ItemParts helpers to make recipes more readable. 
This makes recipes easier to both write and understand, because I don't have to wonder what ModItems.parts #8 is, I can just see "dataOrb."
 2015-06-06 23:52:51 -04:00
joflashstudios
7cfaac1f61 Added Digital Chest, Computer Monitor 2015-06-06 22:11:13 -04:00
joflashstudios
b01399f2b5 Fixed helium coolant cell textures. 2015-06-06 15:57:53 -04:00
modmuss50
18eed2bf0a fixes #17 2015-05-29 21:54:56 +01:00
Gig
1f9600b33c Organized imports 
Changed centrifuge to new recipe system
 2015-05-19 23:00:36 +01:00
Gig
20a9cabf93 Little clean and format change 2015-05-17 22:58:53 +01:00
Gig
ca98541d70 Start on hammer 2015-05-17 02:16:40 +01:00
Gig
fc11db09cc Added bucket textures to items 2015-05-15 17:05:18 +01:00
Tntrololol
60ce6187f1 Added another massive amount of localizations 2015-05-09 18:42:11 -05:00
Tntrololol
48280690f5 Fixed a bunch of localizations 2015-05-08 23:59:10 -05:00
Tntrololol
8b0a1eb894 Merge remote-tracking branch 'origin/master' 2015-05-08 21:37:45 -05:00
Tntrololol
b5b2ea64fb Removed item text color as it is used only to denote rare items. 2015-05-08 21:37:38 -05:00
Gig
55656c13a5 More fluid stuff 2015-05-09 02:15:38 +01:00
Gig
1ae5a20517 More fluid stuff lot more TODO 2015-05-09 00:36:55 +01:00
Tntrololol
111cd541b5 Added missing galena ore items 2015-05-07 17:29:01 -05:00
Tntrololol
4f0942f215 Added a ton of IC2 crafting recipes 2015-05-07 12:39:47 -05:00
Tntrololol
e8fc6d5a07 Fixed ore dict registration and missing items 2015-05-05 19:50:34 -05:00
Tntrololol
558aef45e8 added IC2 ingots for standalone capability 2015-05-04 22:37:59 -05:00
Tntrololol
1685410a35 Modified nugget names 2015-05-04 20:00:22 -05:00
Tntrololol
8b106ecbcd Changed icon directory 2015-05-04 19:45:24 -05:00
Tntrololol
fc7f25f699 Added names for purified crushed ores 2015-05-04 19:30:45 -05:00
Tntrololol
57780d23ed Added names for crushed ores 2015-05-04 19:24:47 -05:00
Tntrololol
6c4b87e07a Changed "aluminium" to "aluminum" to fix missing icon 2015-05-04 19:16:15 -05:00
Tntrololol
32765a4343 Updated plate names 2015-05-04 18:30:13 -05:00
Tntrololol
a66834cf88 Fixed copy paste error 
I should really download eclipse...
 2015-05-04 18:15:30 -05:00
Tntrololol
e5efe4f28a Fixed capitalization and icon directory string 2015-05-04 18:06:37 -05:00
Tntrololol
ef0afe7269 Fixed spelling mistake 2015-05-04 18:03:56 -05:00
Tntrololol
e59e954c55 Added metal rods 2015-05-04 17:58:06 -05:00
Gig
f4a717c0ea All the items 2015-05-04 21:52:08 +01:00
Tntrololol
e780191616 More syntax errors... 2015-05-04 13:59:19 -05:00
Tntrololol
5378cd2134 Added various missing parts and reactor components 2015-05-04 13:57:15 -05:00
Tntrololol
a303ddad62 Fixed yellow garnet misspelling. 2015-05-04 13:31:31 -05:00
modmuss50
77fb5949b9 Fixed compile errors 2015-05-04 08:02:01 +01:00
Tntrololol
9aff74fddc Missed a few 2015-05-03 23:37:20 -05:00
Tntrololol
77f761f1a6 Missed one 2015-05-03 23:36:55 -05:00
Tntrololol
6884f4ff1c Added missing ingots and fixed capitalization 
Added ingots for antimony, battery alloy, red alloy, blue alloy, cadmium, cupronickel, indium, kanthal, lodestone, magnalium, nichrome, and tellurium.
 2015-05-03 23:35:13 -05:00
Tntrololol
46a10b8cc7 Replaced olivine with peridot 2015-05-03 23:28:28 -05:00
Tntrololol
859ebc047e Fixed copy paste mistake 
Sorry, currently not using an IDE.
 2015-05-03 23:27:02 -05:00
Tntrololol
220febc0c5 Added missing small dusts and fixed capitalization 
Added small dusts for antimony, biotite, cadmium, cupronickel, dark iron, glowstone, graphite, indium, kanthal, lapis, limestone, lodestone, magnetite, manganese, mithril, nichrome, peridot, phosphorous, potassium feldspar, "redstone", silicon, sodalite, tellurium, teslatite, tetrahedrite, vinteum, and voidstone.
 2015-05-03 23:25:23 -05:00
Tntrololol
636528bddc Added missing dusts and fixed capitalization 
Added dusts for antimony, biotite, cadmium, cupronickel, dark iron, graphite, indium, kanthal, lapis, limestone, lodestone, magnetite, manganese, mithril, nichrome, peridot, phosphorous, potassium feldspar, silicon, sodalite, tellurium, teslatite, tetrahedrite, vinteum, and voidstone.
 2015-05-03 23:17:09 -05:00
Tntrololol
982ec40192 Added tritium cell 2015-05-03 22:54:38 -05:00
Gig
d6b38f238e test fix for no textures on ingots 2015-05-04 00:18:35 +01:00
Gig
786d609d86 Fixed rockcutter breaking 2015-05-03 23:53:33 +01:00
Gig
26b60d2896 Removed OLD textures 
Added texture for uu
Added 1st uu recipe
Added configs
 2015-05-03 13:49:28 +01:00
Gig
88c8771e8b Moved to Techreborn misc tab 2015-04-28 16:07:02 +01:00
Gig
34010525ba UU matter 2015-04-27 23:54:22 +01:00
Gig
a05b0d01bf More worldgen config pokes @Mj11jM ;) 2015-04-27 22:39:33 +01:00
Gig
4ac26ac086 Format 2015-04-24 14:20:09 +01:00
Gig
1a68b5c7c6 Clean 
New achievements
Renamed Manuel to PDA
Moved PDA class's to PDA package
 2015-04-18 21:24:49 +01:00
Gig
787df47cfa Started on TechManuel 2015-04-18 12:13:22 +01:00
Gig
a42c707470 Added TechrebornMisc creative tab 
Moved dusts and cells to misc tab
 2015-04-18 11:47:09 +01:00
Gig
168497db9b tech reborn Manuel Item 2015-04-17 20:12:58 +01:00
Gig
b505eeaf30 Added base Ic2 ores 2015-04-17 12:47:10 +01:00
Gig
4a3214320c Added Machine casings 
Added more textures
 2015-04-17 00:15:33 +01:00
Gig
3c87b1ad1d Added cells 2015-04-16 23:42:05 +01:00
Gig
7cbd27150e Added small dusts 2015-04-16 23:27:25 +01:00
Gig
39a8ffe739 Changed name of chestplate to gravity chest plate 2015-04-16 23:26:50 +01:00
Modmuss50
8e7d6b011e Auto formatted, and cleaned imports 2015-04-15 16:23:12 +01:00
Gig
60bcbd10ad Moved/Replaced Textures 2015-04-14 16:21:23 +01:00
Gig
8191e1eaaa Added Tcon dusts/ingots 2015-04-14 14:41:53 +01:00
Gig
b51a1d498c Even more configs !! 2015-04-14 13:15:47 +01:00
Gig
4746968a04 Moved batpack/lapotronpack to Items/Armor 
Added Gravity Chestplate (WIP)
 2015-04-14 01:09:38 +01:00
Gig
6dec53208e More Configs!!!!! 2015-04-13 19:50:35 +01:00
Gig
dbb6a9edf2 Added advanced drill 
Added TorchHelper.class
 2015-04-13 19:08:17 +01:00
Gig
4a291087ad Added omnitool 2015-04-13 18:43:31 +01:00
Gig
49474e741e Added charged/uncharged tools to creative tab 2015-04-12 23:39:38 +01:00
Gig
bdc34c393d Added LapotronPack 2015-04-12 23:38:30 +01:00
Gig
a46645ff42 Added lithiumbatpack 2015-04-12 23:22:53 +01:00
Gig
da6e88c254 Added rockcutter 2015-04-12 22:45:13 +01:00
Gig
9b5a57bedb More recipes and organized imports 2015-04-12 20:04:12 +01:00
Gig
ddd2064a02 A few textures from the wiki ;) 2015-04-12 17:26:01 +01:00
modmuss50
91495286db Clean imports 2015-04-12 09:45:31 +01:00
Gig
3d5439b511 Added Localizations for dusts/gems/ingots/parts 2015-04-11 21:31:38 +01:00
Gig
e87f2d2430 Added all gems and crafting parts 2015-04-11 20:46:55 +01:00
Gig
57c38eb99e Ore Localizations and changed ore names to "techreborn.ore" 2015-04-11 17:24:32 +01:00
Gig
e87908dc03 Added all gtechs ores 2015-04-11 16:21:49 +01:00
Gig
1704f989c5 Added ItemTR.class for easy item creation 2015-04-11 00:37:04 +01:00
Gig
6df95800e1 Added basic recipe remover for use in overriding Ic2 recipes. 2015-04-11 00:29:11 +01:00
Gig
0e2ad2637f Added basic Item for all the dusts 2015-04-11 00:12:59 +01:00