modmuss50
751746df6f
Allow lang files to specify the location of the fluid name, closes #1386
2017-12-28 14:19:26 +00:00
Modmuss50
cbcb465c97
Added support for individual slot configuration
...
* start work on slot config
* More slot work
* More gui work for slot config
* Remove old sided code
* More slot work
* More slot memes
* Stuff seems to be working :)
* Start work on auto input / output
* Slot IO check boxes now work
* Fix buttons at different screen resolutions
* Improve close button
* Gui polish
* Fix multiblock hologram rendering
* More fixes + changes
* Cleanup + output fix
2017-12-25 00:18:43 +00:00
drcrazy
05884b2fda
Fix issue with chainsaw cutting speed. Closes #1376
2017-12-23 00:28:53 +03:00
modmuss50
5a40749bcd
Fixed #1364
2017-12-22 12:51:16 +00:00
drcrazy
dce7e43c4f
Fixed amount for empty cells. Closes #1366
2017-12-16 01:46:34 +03:00
Dimmerworld
3c68417fd9
Item liquidation ( #1347 )
...
We salute our brace comrades:
Solar panel
Compact solar panel
and Quantum singularity
Whom wern't quite ready to be implemented.
2017-12-01 17:16:39 +03:00
drcrazy
f6fca1c623
Merge branch '1.12' of https://github.com/TechReborn/TechReborn.git into feature/solar-panles
2017-11-29 17:13:36 +03:00
modmuss50
b8964b6eca
Update mappings
2017-11-28 17:25:36 +00:00
drcrazy
eab088c094
Merge branch '1.12' into feature/solar-panles
...
Conflicts:
build.gradle
src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
src/main/java/techreborn/blocks/lighting/BlockLamp.java
2017-11-28 17:28:47 +03:00
drcrazy
bf5b649fc4
Removed unused code, added Override annotation
2017-11-12 12:15:32 +03:00
Dimmerworld
5d0b5c3ea3
Balance, textures and items
2017-10-27 09:34:55 +03:00
Dimmerworld
9855cce93d
Upgrade merge
2017-10-27 09:34:53 +03:00
Dimmerworld
c651363b73
Update to latest commit(Master)
2017-10-27 09:34:47 +03:00
drcrazy
5702e79e7a
Do net reset block break progress upon item charge. Closes #1312
2017-10-20 03:00:28 +03:00
drcrazy
441ac4887a
Made Cloaking device wearable in 1.12. Closes #1314
2017-10-20 01:58:35 +03:00
modmuss50
a590fd8ee1
Should fix #1289
2017-10-08 18:56:07 +01:00
drcrazy
350d3589c9
Fix warnings for subitemtype instead of supressing it
2017-10-08 01:59:28 +03:00
drcrazy
12e2cbe11b
Fixed textformatting warnings
2017-10-07 14:39:30 +03:00
modmuss50
4e536718a3
Large changes to allow the Electrical Furnace to be upgraded
2017-10-04 13:35:58 +01:00
modmuss50
e5e05d0afd
Chainsaw chops down the entire tree
2017-10-03 17:39:33 +01:00
modmuss50
f00214f7de
Rewrite item power distribution to support fe. should fix #1260
2017-10-03 17:02:58 +01:00
drcrazy
1b4fee595d
Fixed warnings
2017-09-30 03:58:01 +03:00
modmuss50
f5076ea8af
Downgrade mappings + update all libs
2017-09-28 23:44:16 +01:00
modmuss50
e74067db40
1.12.2
2017-09-18 23:47:07 +01:00
drcrazy
8de19ff5e7
Fix warnings
2017-09-14 17:55:28 +03:00
drcrazy
b13d282bf1
Fix unused imports
2017-09-09 01:54:43 +03:00
drcrazy
aa2df32222
Fix build
2017-09-08 02:11:49 +03:00
drcrazy
ab1802ba5e
Refactoring for translation
2017-09-08 02:03:35 +03:00
drcrazy
8588a40474
Added plateIridiumAlloy. Closes #1262 . Closes #1073
2017-09-06 02:38:07 +03:00
drcrazy
07b1724e24
Updated max energy storage for several tools. Closes #1219
2017-09-01 16:19:59 +03:00
drcrazy
46f9266197
Magnalium plate is back. Closes #1109
2017-08-31 03:02:00 +03:00
modmuss50
6f6800e75a
Rewrite wrench to use new API
2017-08-30 21:57:14 +01:00
modmuss50
20e9276bd9
Fixes #1043
2017-08-30 21:25:13 +01:00
drcrazy
ab1428eb12
Fix for machine tank drain. More luv to industrial grinder. ( #1254 )
...
* Fix for machine tank drain. More luv to grinder
Fix for empty cell drained from tank.
JEI should honor power units (FE\EU) used.
Fill\drain tank only two times per second in order to avoid game crash
due to ticking entity.
2017-08-29 19:57:21 +03:00
drcrazy
e19e483d2f
No more excessive NBT tags for drained cells. Closes #1244 , #1216 ( #1248 )
2017-08-25 20:57:47 +01:00
David Vierra
a016a6dd49
Replace all emptiness checks == ItemStack.Empty
with .isEmpty()
( #1247 )
...
Fixes #1157 and probably a few other things.
2017-08-25 11:08:15 -07:00
drcrazy
df808760ad
Make cells drainable again ( #1246 )
...
* FIx unused import
* Make cells drainable again
* Fix deprecated warning
2017-08-25 00:39:44 -07:00
modmuss50
77e833f9d4
Fixes #1197
2017-07-28 21:08:11 +01:00
modmuss50
cead631367
Added a generous amount of recipes into thermal expansion, close #1110
2017-07-06 23:49:00 +01:00
modmuss50
2529f3fd9a
Try and prevent invalid ore dict names being registered
2017-07-01 19:27:07 +01:00
modmuss50
3e5f02ab4e
Small improvements to the cables
2017-06-29 17:19:34 +01:00
modmuss50
5203ad5b01
Debug tool supports FU
2017-06-29 16:44:49 +01:00
modmuss50
81aee77869
Fix energy storage blocks not rotating
2017-06-29 16:03:22 +01:00
modmuss50
0e8505b072
Remove reminents of core mod + fix powered items
2017-06-29 12:37:06 +01:00
modmuss50
774fec221e
Auto format code
2017-06-28 20:54:12 +01:00
modmuss50
ba644982fe
Update to support new forge registry system
2017-06-24 20:15:49 +01:00
modmuss50
7bbb23c876
Fix drill being able to break bedrock, and slow it down slightly
2017-06-22 12:58:43 +01:00
modmuss50
aa615f86bd
Recipes are now added to the recipe book when a tree tap is used.
2017-06-15 11:35:08 +01:00
Prospector
1fa9f1cf52
Begin the Great Refactor of Mid-2017
2017-06-13 16:49:52 -07:00
modmuss50
708ccc758a
Mappings update
2017-06-13 22:07:49 +01:00
modmuss50
b7e141e004
More config changes
2017-06-12 20:33:30 +01:00
modmuss50
0cf3e43992
Update to support RC changes
2017-06-12 20:06:15 +01:00
modmuss50
e0c39a4777
Fix Creative tab issue
2017-06-12 17:30:21 +01:00
modmuss50
b25742dde0
Auto format code
2017-06-12 14:23:32 +01:00
modmuss50
29cf9fa90b
1.12
2017-06-11 21:22:07 +01:00
modmuss50
3a6724b6f4
Advanced diamond drill is now 3x3
2017-05-27 01:49:07 +01:00
modmuss50
d605b7175f
Fix Server crash with last version, #releaseBuild
2017-04-14 22:33:21 +01:00
modmuss50
83e904f464
Fix build
2017-04-13 11:26:16 +01:00
modmuss50
02f17871c6
Added power teir upgrades.
2017-04-12 19:58:03 +01:00
modmuss50
1c1f540a26
Drop upgrades when machine is broken, shift right-click to add into machine.
2017-04-12 18:31:26 +01:00
modmuss50
d9af8309b1
Finished the gui, and start work on adding support for the furnace.
2017-04-12 18:04:10 +01:00
modmuss50
7541ba4dbb
Add the basic gui for side configuration
2017-04-12 16:35:56 +01:00
modmuss50
088f49c305
Allow the upgrades to be right clicked when in the gui.
2017-04-12 16:21:04 +01:00
modmuss50
5487584f04
Finish off the rendering for the upgrades.
2017-04-11 21:10:48 +01:00
modmuss50
e05c132c3a
Added basic push and pull upgrades
2017-04-11 20:42:55 +01:00
modmuss50
6355d11b0f
Add energy storage upgrades.
2017-04-11 19:26:46 +01:00
modmuss50
4f05367f52
Got the upgrades working, just need the textures.
2017-04-11 13:21:23 +01:00
modmuss50
c678fe7f9a
Add example speed upgrades.
2017-04-11 00:30:27 +01:00
modmuss50
34978f7ffe
Remove old upgrade handler to make way for the new one.
2017-04-11 00:12:36 +01:00
ProfessorProspector
94341db24a
Fix axes I broke
2017-03-30 18:56:15 -07:00
ProfessorProspector
dc638cea9c
Axes extend ItemAxe Fixes #1027
2017-03-30 18:02:58 -07:00
modmuss50
26c208e811
Added license info to the header of all files.
2017-02-23 12:29:43 +00:00
Ourten
57d1c60750
Fix JackHammer crash when mining blocks
2017-02-04 13:47:26 +01:00
Ourten
e0300d3a05
Fix nanosaber log spam
2017-02-03 14:18:15 +01:00
modmuss50
4e0878b182
Move this to the correct location
2017-01-18 11:23:52 +00:00
modmuss50
8b24fdf765
Merge remote-tracking branch 'remotes/origin/feature/containers-builder' into 1.11.2
...
# Conflicts:
# src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
2017-01-10 19:34:17 +00:00
modmuss50
0d22eb2c56
Fix jackhammer not breaking all rocks, closes #864
2017-01-10 19:28:12 +00:00
ProfessorProspector
06cb13b910
useless range upgrade
2017-01-09 07:18:19 -08:00
Ourten
eb220643fc
Change all containers init to IContainerProvider + Add Enum for gui ids handling
2017-01-08 20:34:46 +01:00
Prospector
6a70424252
Continue the "Great refactor of 2017". Massive variable name refactoring and start splitting crafting table recipes to their own class.
2016-12-31 23:29:32 -08:00
ProfessorProspector
c24116e259
Redo all Industrial Grinder recipes, and move them to a separate class (Here starts the great recipe cleanup of 2017!)
2016-12-30 23:45:42 -08:00
ProfessorProspector
415660c988
Tweak how nugget recipes are done once again, and \o/ 2500th commit!
2016-12-22 15:12:13 -08:00
ProfessorProspector
2ecf8400b8
Fix red garnet drops
2016-12-21 17:03:34 -08:00
ProfessorProspector
bdde7859f9
Fix any other potential bugs with the gems or any other forgotten items from the great rename of December 2016. This day shall be known as the day that I have prevented more bugs from the 8 or so bug reports I have caused from a single line of code changed about a week ago. It was a shame that it had gotten so far, but this should make sure that it does not happen again. All ingots/gems/plates/dusts/nuggets/smalldusts now convert any camelCase input to snake_case before handling it. This is probably the longest commit message I have ever written. Closes #860
2016-12-21 16:47:53 -08:00
modmuss50
ccdb5c0761
Fix merge issues, fix build
2016-12-14 09:28:05 +00:00
modmuss50
c1d2e875bf
Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/blocks/BlockRubberLog.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/items/tools/ItemElectricTreetap.java
# src/main/java/techreborn/items/tools/ItemTreeTap.java
2016-12-14 09:23:24 +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
ProfessorProspector
c271422e11
Remove deprecated empty cell
2016-12-12 15:57:04 -08:00
ProfessorProspector
764396d7ef
ALL ITEMS USE JSON NOW \o/
2016-12-12 15:44:16 -08:00
ProfessorProspector
0273a619f1
Remove old jsondestroyer things
2016-12-11 23:03:51 -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
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
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
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
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
f07bae19bd
Fix iridium stone, remove silicon ingot.
2016-12-05 13:00:54 +00:00
modmuss50
e6c58a04b7
Fix Lapotronic Orb
2016-12-05 10:54:46 +00:00
modmuss50
40835a2773
Update forge version
2016-12-05 09:19:16 +00:00
modmuss50
83ef3e7577
Start of new texturesm, again
2016-11-28 12:54:44 +00:00
modmuss50
3a470df08b
Fix #791
2016-11-26 19:10:29 +00:00
modmuss50
e16c3eba02
Auto format
2016-11-25 13:25:51 +00:00
modmuss50
97b233dd44
Fix resources #1
2016-11-25 13:23: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
a0e6a2dc34
Start on the update
2016-11-19 12:50:08 +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
modmuss50
c9ff3330ca
Fix #794 , fix some issues with ic2 wrench, and use new forge perms to check when taping and wrenching blocks
2016-11-05 15:10:28 +00:00
modmuss50
796df6c055
Auto Format code
2016-10-08 20:46:16 +01:00
modmuss50
ac05373963
Fix #752 Jackhammer now works on all vanilla stone types
2016-09-27 18:27:40 +01:00
modmuss50
d5ff2a42bb
Fixes #723 and wrench works with ic2 machines now
2016-09-06 22:16:21 +01:00
modmuss50
aa05d906f9
Revert "Wires now transfer energy from all mods and manages it as EU. ( #686 )"
...
This reverts commit 6f54e3801f
.
# Conflicts:
# src/main/java/techreborn/tiles/storage/TileEnergyStorage.java
2016-08-10 00:45:33 +01:00
modmuss50
22fd152ec9
Revert "Energy storages item charging fixes, transformers fixes, electric items fixes."
...
This reverts commit be4f10b975
.
# Conflicts:
# src/main/java/techreborn/init/ModBlocks.java
2016-08-10 00:29:47 +01:00
Nico
9a73c3321e
First few Fixes ( #707 )
...
* Fixed missing translations
The Plates were only typos...
* Removed old textures
* Added new textures
* Fixed typo for texture
2016-08-02 00:35:00 +01:00
Dragon2488
be4f10b975
Energy storages item charging fixes, transformers fixes, electric items fixes.
2016-07-25 15:10:55 +07:00
Archengius
6f54e3801f
Wires now transfer energy from all mods and manages it as EU. ( #686 )
...
* Wires now transfer energy from all mods and manages it as EU. Multipart will fire in hell.
* Fix TechReborn to work with latest RebornCore
2016-07-21 07:51:55 -07:00
Dragon2488
33df1d3319
Implemented Lightning Rod, improved ore dictionary integration for dusts, nuggets and plates. Plates now registers automatically for every gem and ingot in TR. ( #673 )
2016-07-16 10:44:54 +01:00
Dragon2488
2b148f3d68
Properly fluid rendering in dynamic cells. Temporary fix of recipes incapability with renamed (or tagged) cells. Merge dynamic and empty cells into one item. Right click on fluid block fills cell with fluid.
2016-07-15 12:15:09 +07:00
modmuss50
315c0aa509
Revert "Revert a shit load of stuff"
...
This reverts commit d25bb23e8e
.
2016-07-01 15:55:37 +01:00
modmuss50
d25bb23e8e
Revert a shit load of stuff
2016-07-01 15:40:46 +01:00
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