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
|
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 |
|
