modmuss50
|
6713cd6296
|
Initial removal of itemblocks, wrench now drops the item with the nbt of the tile.
This is still WIP but mostly seems to work
|
2018-09-25 17:51:25 +01:00 |
|
drcrazy
|
1e9cfa07b6
|
Removed excessive setCreativeTab from blocks
|
2018-09-25 13:56:59 +03:00 |
|
drcrazy
|
f600432f05
|
All machines are now in enum.
|
2018-09-25 13:39:41 +03:00 |
|
drcrazy
|
25f06384f4
|
Energy storage enum-ed
|
2018-09-25 03:09:56 +03:00 |
|
drcrazy
|
dd94ff31c9
|
Blocks moved to TRContent
|
2018-09-24 15:45:48 +03:00 |
|
drcrazy
|
bf7f7ba871
|
Renamed ModBlocks to TRBlocks
|
2018-09-23 23:21:19 +03:00 |
|
modmuss50
|
e068ca018c
|
flatten cables, they dont render correctly in world yet
|
2018-09-20 19:49:25 +01:00 |
|
drcrazy
|
4245decc3c
|
Some work on solar panels flattening
|
2018-09-18 15:32:13 +03:00 |
|
drcrazy
|
f6c143dce3
|
Flattened casings
|
2018-09-16 03:34:26 +03:00 |
|
drcrazy
|
1d4116a215
|
Flattened frames
|
2018-09-14 17:16:59 +03:00 |
|
drcrazy
|
305f74b107
|
Storage blocks flattened
|
2018-09-12 16:56:24 +03:00 |
|
drcrazy
|
916c8c5ba4
|
Initial work on ores flattening
|
2018-09-10 16:45:04 +03:00 |
|
drcrazy
|
6d4616b38e
|
Updated constructor parameter name
|
2018-09-04 17:37:32 +03:00 |
|
modmuss50
|
f5c6b59ebd
|
Mappings
|
2018-07-20 22:31:20 +01:00 |
|
Prospector
|
6d3b415ddd
|
Unify creative tabs
|
2018-06-12 15:42:20 -07:00 |
|
drcrazy
|
1ad23439eb
|
Cleaned up supressed warnings
|
2018-05-25 14:24:35 +03:00 |
|
drcrazy
|
de61d24082
|
Sorted out blocks between tiers
|
2018-04-27 18:06:57 +03:00 |
|
modmuss50
|
9c7f1995a8
|
Update year in license
|
2018-02-11 14:08:13 +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 |
|
drcrazy
|
19ccbd681d
|
Fixed itemBlock rendering. TOP\Waila are still an issue
|
2017-11-05 02:32:06 +03:00 |
|
modmuss50
|
e0edff6891
|
Some more work on solar panels.
|
2017-10-27 09:40:10 +03:00 |
|
Dimmerworld
|
c651363b73
|
Update to latest commit(Master)
|
2017-10-27 09:34:47 +03:00 |
|
drcrazy
|
ab1802ba5e
|
Refactoring for translation
|
2017-09-08 02:03:35 +03: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 |
|
modmuss50
|
138de281f4
|
Fixes issue with cable crafting, #betaBuild
|
2017-06-22 20:27:05 +01:00 |
|
modmuss50
|
a701094d1d
|
Update all license headers
|
2017-06-15 12:28:26 +01:00 |
|
Prospector
|
40e3062903
|
Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP)
|
2017-06-14 08:56:09 -07:00 |
|
modmuss50
|
b25742dde0
|
Auto format code
|
2017-06-12 14:23:32 +01:00 |
|
modmuss50
|
624d8fb93a
|
Remove old cables
|
2017-06-12 10:55:26 +01:00 |
|
modmuss50
|
007e8714fa
|
Improvements to cables.
|
2017-06-12 10:47:38 +01:00 |
|
modmuss50
|
29cf9fa90b
|
1.12
|
2017-06-11 21:22:07 +01:00 |
|
modmuss50
|
26c208e811
|
Added license info to the header of all files.
|
2017-02-23 12:29:43 +00: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
|
49f227ca81
|
MORE JSONS: UU matter, upgrades, scrapboxes, and rubber sapling! Also fix rubber sapling model
|
2016-12-11 17:27:39 -08:00 |
|
modmuss50
|
5dff31d937
|
A bunch more null check \o/
|
2016-12-06 18:22:18 +00:00 |
|
modmuss50
|
2fdce5405b
|
Improve block names
|
2016-12-05 09:40:55 +00:00 |
|
modmuss50
|
796df6c055
|
Auto Format code
|
2016-10-08 20:46:16 +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
|
cdae866b2d
|
Revert "Rewrite to use new RebornCore Power API. Texture fixes."
This reverts commit b292fdd352 .
# Conflicts:
# src/main/java/techreborn/client/gui/GuiImplosionCompressor.java
# src/main/java/techreborn/client/gui/GuiIndustrialGrinder.java
# src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/tiles/TileAlloyFurnace.java
# src/main/java/techreborn/tiles/TileAlloySmelter.java
# src/main/java/techreborn/tiles/TileAssemblingMachine.java
# src/main/java/techreborn/tiles/TileImplosionCompressor.java
# src/main/java/techreborn/tiles/TileIndustrialSawmill.java
# src/main/java/techreborn/tiles/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java
# src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java
# src/main/java/techreborn/tiles/teir1/TileCompressor.java
# src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java
# src/main/java/techreborn/tiles/teir1/TileExtractor.java
# src/main/java/techreborn/tiles/teir1/TileGrinder.java
# src/main/java/techreborn/tiles/teir1/TileRecycler.java
|
2016-08-10 00:45:07 +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 |
|
Dragon2488
|
be4f10b975
|
Energy storages item charging fixes, transformers fixes, electric items fixes.
|
2016-07-25 15:10:55 +07:00 |
|
Dragon2488
|
b292fdd352
|
Rewrite to use new RebornCore Power API. Texture fixes.
|
2016-07-21 22:22:56 +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 |
|
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
|
4c5cf82db4
|
Rewrite ores
|
2016-05-16 15:48:48 +01:00 |
|
modmuss50
|
5eed5b161d
|
Code formatter take 2
|
2016-03-25 09:47:34 +00:00 |
|
modmuss50
|
33985f1a31
|
Revert "Added code formatter"
This reverts commit b9448d5d90 .
|
2016-03-24 00:41:47 +00:00 |
|
modmuss50
|
b9448d5d90
|
Added code formatter
|
2016-03-24 00:39:26 +00:00 |
|
modmuss50
|
8c24711d4f
|
Optimise imports
|
2016-03-15 08:13:05 +00:00 |
|