Commit graph

2730 commits

Author SHA1 Message Date
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
c880fbe2f8 #releaseBuild 2016-12-11 10:16:05 -08:00
ProfessorProspector
e7c36338f7 TR now will work on servers again 2016-12-11 10:15:49 -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
7bd8cf8562 #betaBuild 2016-12-10 22:02:06 -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
ab1628de58 Bump version for hotfix 2016-12-10 15:01:19 -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
bd83c55754 Bump version #releaseBuild 2016-12-10 14:30:37 -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
7426f4e3ed bump version for #releasebuild 2016-12-07 13:49:44 +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
4a19f4ac6b Bump version #releasebuild 2016-12-06 20:50:25 +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
bf60b32eb2 Version 2.0.0 #betaBuild 2016-12-05 13:13:42 +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
b1e00e6ce7 Update build.conf 2016-12-05 10:59:43 +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