Commit graph

2150 commits

Author SHA1 Message Date
modmuss50
ee96908775 Disable recipe, to fix crash with a certain set of mods. #releaseBuild 2016-12-13 19:19:12 +00:00
Thomas Guillemard
ebf569a906 Make treetap working with the IC2 rubber tree (Fix #786) (#831)
Changes:
- The dependency of IC2 have been updated to the last version
- This implementation follow the original treetap logic but use
Techreborn original electrical cost.
2016-12-13 16:24:38 +00:00
modmuss50
601194685b Merge 1.10 changes, bump version for #releaseBuild 2016-12-13 11:53:33 +00:00
modmuss50
a3b4e9de6e Merge 1.10, bump version for #releaseBuild 2016-12-13 11:51:33 +00:00
ProfessorProspector
3378c910a3 Fix lang 2016-12-12 16:05:32 -08:00
ProfessorProspector
c271422e11 Remove deprecated empty cell 2016-12-12 15:57:04 -08:00
ProfessorProspector
de5ebf5ae3 Merge branch '1.11' of https://github.com/TechReborn/TechReborn into 1.11 2016-12-12 15:44:33 -08:00
ProfessorProspector
764396d7ef ALL ITEMS USE JSON NOW \o/ 2016-12-12 15:44:16 -08:00
modmuss50
0d7e26e74a Remove log, and add small dusts to ore dict 2016-12-12 17:54:20 +00:00
modmuss50
29f40e1f98 Add plate recipes based of ore dic 2016-12-12 15:53:04 +00:00
modmuss50
27862b0a28 Add some more recipes listed in #818 2016-12-12 15:29:25 +00:00
modmuss50
7a4c7cfea9 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-12 09:53:30 +00:00
modmuss50
71d8a3c7e8 Iron furnace now uses the same sides as the vanilla furnace, closes #622 2016-12-12 09:49:00 +00:00
modmuss50
59b7610227 Fix extractor recipe allowing any wood for sap extraction, close #381 again 2016-12-12 09:22:19 +00:00
ProfessorProspector
0273a619f1 Remove old jsondestroyer things 2016-12-11 23:03:51 -08:00
ProfessorProspector
a681fe4be6 Even more jsons: Cloaking device, electric treetap, lapotronic orbpack, lithium batpack, rockcutter, omnitool, manual, treetap, wrench, and refactor some model paths 2016-12-11 23:00:08 -08:00
ProfessorProspector
b3988e4c4f Register cables in preinit, and switch cable items and storage blocks to jsons 2016-12-11 22:25:27 -08:00
ProfessorProspector
14c2b540f2 Modify galena texture 2016-12-11 22:12:52 -08:00
ProfessorProspector
e6ba58eb45 Fusion Coils now use jsons 2016-12-11 18:22:35 -08:00
ProfessorProspector
7379e32a17 Ores use json 2016-12-11 18:05:03 -08:00
ProfessorProspector
49f227ca81 MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model 2016-12-11 17:27:39 -08:00
ProfessorProspector
257a838c2c couple more langs 2016-12-11 16:48:30 -08:00
ProfessorProspector
7b5c6a6102 Fix some lang and models 2016-12-11 16:47:28 -08:00
ProfessorProspector
8012abee3b Move dusts and smalldusts to json 2016-12-11 11:34:56 -08:00
ProfessorProspector
3da6083c68 Nuggets now use jsons, and nuggets now return proper subtypes 2016-12-11 10:58:20 -08:00
ProfessorProspector
718fc53bbd Let players set freq. transmitter to interactive block (shift click no longer clears on blocks) and unify tooltip 2016-12-11 10:07:56 -08:00
ProfessorProspector
ab1b1ca409 Fix #829 hopefully 2016-12-10 22:53:02 -08:00
ProfessorProspector
03b0aef687 slight adjustment #betaBuild 2016-12-10 21:56:00 -08:00
ProfessorProspector
86b98cab13 Unify tooltip messages, fix cable subtypes, and fix ruby drops 2016-12-10 18:13:27 -08:00
ProfessorProspector
61de7101c3 TOP support now changes colours based on energy system config 2016-12-10 17:15:30 -08:00
ProfessorProspector
5186f3d0ae #releaseBuild 2016-12-10 15:04:24 -08:00
ProfessorProspector
9e3372c5aa remove debug line 2016-12-10 15:00:53 -08:00
ProfessorProspector
d510b24599 Fix improper plate ore dictionary entries 2016-12-10 15:00:20 -08:00
ProfessorProspector
7e0b84360c Fix ore dict recipes 2016-12-10 14:27:37 -08:00
ProfessorProspector
2911e7f0ca Move ingots, plates, and gems to jsons 2016-12-10 00:15:39 -08:00
ProfessorProspector
89ffb5d047 More jsons! 2016-12-09 22:50:26 -08:00
ProfessorProspector
20193b562a Switch frequency transmitter, chainsaws, drills, and jackhammers to jsons 2016-12-09 17:01:19 -08:00
ProfessorProspector
226c0bc619 Improve energy bars on items 2016-12-08 18:39:49 -08:00
ProfessorProspector
467544ebfe Much improve the StackInfoHUD and move it to RC 2016-12-07 22:09:13 -08:00
modmuss50
24455a148c Fix build #betabuild 2016-12-07 13:55:36 +00:00
modmuss50
3f8128d890 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 #betabuild
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
#	src/main/java/techreborn/items/tools/ItemWrench.java
2016-12-07 13:52:48 +00:00
modmuss50
85b174929c Disable ore validation as it was casing issues with ores in incorrect dimensions. Also add endstone to ore clear command. 2016-12-07 13:48:46 +00:00
modmuss50
0208ec58f2 Only allow correct inputs to alloy smelter, should aid with automation. closes #813 2016-12-07 13:35:51 +00:00
modmuss50
695ca83896 Fix drill recipes, closes #819 2016-12-07 13:27:20 +00:00
modmuss50
f633df81c2 Toggle facing across opposites 2016-12-07 13:22:53 +00:00
modmuss50
256b3f1b47 Allow wrench to roate energy storage devices 2016-12-07 13:18:18 +00:00
modmuss50
5dff31d937 A bunch more null check \o/ 2016-12-06 18:22:18 +00:00
modmuss50
97e5fcc032 Fix #825 2016-12-06 08:23:11 +00:00
modmuss50
a42cf2990f Fix recipes, without silicon 2016-12-05 13:04:21 +00:00
modmuss50
f07bae19bd Fix iridium stone, remove silicon ingot. 2016-12-05 13:00:54 +00:00
modmuss50
c04a98061a Hide Missing recipe item in JEI 2016-12-05 12:50:55 +00:00
modmuss50
8581848a16 Fix lesu storage 2016-12-05 12:48:38 +00:00
modmuss50
430a3313c4 Fix Reinforced Glass 2016-12-05 12:39:16 +00:00
modmuss50
463740ac99 Rename method to reflect the 1.11 changes. 2016-12-05 11:19:37 +00:00
modmuss50
d53f4dafc1 Added extra validation to recipe inputs and outputs, fixed one bug because of it. 2016-12-05 11:18:30 +00:00
modmuss50
75dbf2daff Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11 2016-12-05 10:59:22 +00:00
modmuss50
5782d2d032 Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts:
#	src/main/java/techreborn/client/container/ContainerAlloySmelter.java
#	src/main/java/techreborn/client/container/ContainerAssemblingMachine.java
#	src/main/java/techreborn/client/container/ContainerCentrifuge.java
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-12-05 10:57:55 +00:00
modmuss50
e6c58a04b7 Fix Lapotronic Orb 2016-12-05 10:54:46 +00:00
modmuss50
72f85d5243 Auto format code. 2016-12-05 10:48:21 +00:00
modmuss50
a96c094267 Removed un used block. 2016-12-05 10:21:17 +00:00
modmuss50
8379115c97 Fix Machine Casings 2016-12-05 10:17:39 +00:00
modmuss50
c661f6b278 Fix Machine Casing Model 2016-12-05 10:07:41 +00:00
modmuss50
2fdce5405b Improve block names 2016-12-05 09:40:55 +00:00
modmuss50
40835a2773 Update forge version 2016-12-05 09:19:16 +00:00
brad18
02011b247a Fixes to the Centrifuge Block (#815)
* Fixes Compressor inputting items into output slot

* Changes to Centrifuge block

Add inventory import/export via conduits etc.
Added support for overclockers.
Only allow empty cans into the correct slot and put all other items into slot 0 (ingredient slot).

Credit to Ellpeck for helping with this one.
2016-11-28 21:32:13 +00:00
modmuss50
c72c3b5851 Update JEI support, in a few places I could not figure it out, so there may be some issues. 2016-11-28 15:28:32 +00:00
modmuss50
9c33676b3d Fix nuke texture 2016-11-28 13:05:11 +00:00
modmuss50
1dbc56f739 Remove old redundantt blocks, you should be able to safely ingore the warning when loading 1.10.2 worlds(Still have a backup). 2016-11-28 13:01:30 +00:00
modmuss50
cf9f2def43 Rename folder so git keeps correct caps 2016-11-28 12:55:06 +00:00
modmuss50
83ef3e7577 Start of new texturesm, again 2016-11-28 12:54:44 +00:00
modmuss50
360d9c2756 Fix language files not being applied. 2016-11-28 11:01:33 +00:00
brad18
a5f306eb69 Fixes Compressor inputting items into output slot (#812) 2016-11-27 22:21:09 +00:00
modmuss50
54eee49e5d
Fix #810 2016-11-27 18:31:50 +00:00
modmuss50
b1b8537159
Fix log spam with some machines, closes #809 #releasebuild 2016-11-26 21:14:57 +00:00
modmuss50
7fb93e89e7
Fix #808 2016-11-26 19:15:55 +00:00
modmuss50
3a470df08b
Fix #791 2016-11-26 19:10:29 +00:00
modmuss50
129895e559
Fix #803 2016-11-26 19:05:52 +00:00
modmuss50
757e311804
Fix #804 2016-11-26 19:01:10 +00:00
modmuss50
71a5ec3e2a Add files back, blame git 2016-11-25 13:38:17 +00:00
modmuss50
e16c3eba02 Auto format 2016-11-25 13:25:51 +00:00
modmuss50
aceeb7a037 Fix resources #2 2016-11-25 13:24:01 +00:00
modmuss50
97b233dd44 Fix resources #1 2016-11-25 13:23:42 +00:00
modmuss50
655c5979a0
Add lowercase resources back 2016-11-19 16:37:12 +00:00
modmuss50
fd07083129
Removed upppercase 2016-11-19 16:36:42 +00:00
modmuss50
528fecc2b5
Fix a load of null issues, and get it to sort of work. 2016-11-19 16:36:13 +00:00
modmuss50
65e651f402
It compiles, disable JEI as it needs redoing 2016-11-19 14:41:00 +00:00
modmuss50
a0e6a2dc34
Start on the update 2016-11-19 12:50:08 +00:00
modmuss50
59bd497893
Fix issue with ore generation in some cases 2016-11-07 22:39:53 +00:00
modmuss50
e0118c4cf3
Version 1.4.10
Disabled flares they can come later
2016-11-06 20:26:58 +00:00
brad18
f5172ee496
Update ModRecipes.java (#787)
Brings Cupronickel heating coil recipe into line with Gregtech MC 1.4.7 and fixes #783
2016-11-06 20:14:29 +00:00
modmuss50
d9d8845d6d
Added flare, still needs some textures 2016-11-06 19:14:43 +00:00
modmuss50
d75120bb00
Give more fluids power values 2016-11-05 17:55:50 +00:00
modmuss50
9ffdc3e36e
Fix world gen issues, you may need to delete ores.hjson 2016-11-05 17:54:00 +00:00
modmuss50
b60941ddd4
Fix grinder using twice is recommended power 2016-11-05 17:36:48 +00:00
modmuss50
29b0d2443f
Large buff to power usage, should fix #769 2016-11-05 17:22:24 +00:00
modmuss50
51331b77e7
Adjust MFE and MFSU values, closes #777 2016-11-05 17:09:57 +00:00
modmuss50
0dd3b725ce
Fix recipe crash 2016-11-05 16:53:22 +00:00
modmuss50
dda189fbc6
Add Electric Treetap & Make sap go directly into inventory : From: 2aa69a1425eb8928d530c58e7c8a2495e71ea78f 2016-11-05 16:33:27 +00:00
modmuss50
f669e8b47b
Manually apply: 4fe5b68aaa100eeca675a596fcad9329403ecab8 2016-11-05 16:29:37 +00:00
ProfessorProspector
145124e3dd
Nanosaber now deactivates if it's out of power, and won't activate if there's not enough power.
# Conflicts:
#	src/main/java/techreborn/items/tools/ItemNanosaber.java
2016-11-05 16:28:18 +00:00