Commit graph

558 commits

Author SHA1 Message Date
drcrazy
8d1c116df0 Updated wrench logic for cables. 2018-06-15 16:49:46 +03:00
ProfessorProspector
603e346c0f New ore textures 2018-06-14 19:17:53 -07:00
ProfessorProspector
9ed05fb7ff Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/BlockAlarm.java
2018-06-14 10:57:07 -07:00
ProfessorProspector
cfda5fd2a4 Merge branch '1.12' of https://github.com/TechReborn/TechReborn into 1.12
# Conflicts:
#	src/main/java/techreborn/blocks/generator/BlockCreativeSolarPanel.java
#	src/main/java/techreborn/blocks/generator/BlockWaterMill.java
#	src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
#	src/main/java/techreborn/blocks/storage/BlockLSUStorage.java
#	src/main/java/techreborn/blocks/transformers/BlockTransformer.java
2018-06-14 10:53:32 -07:00
drcrazy
c409b67c3c Updated block wrenching 2018-06-14 18:32:41 +03:00
drcrazy
77e1c54b86 Fixed inventory drop for DSU. More work on #1543 2018-06-14 18:32:40 +03:00
drcrazy
42bc110cb2 Fixed build, but DSU blocks are not done yet. 2018-06-13 17:42:46 +03:00
drcrazy
e2225b06d4 Updated wrenching logic. Some work for #1543 2018-06-13 15:28:31 +03:00
Prospector
6d3b415ddd Unify creative tabs 2018-06-12 15:42:20 -07:00
drcrazy
baacc67a64 Fixed unused and override warnings. 2018-06-12 12:55:57 +03:00
modmuss50
60c8527f6d
Rubber plank stairs and slab 2018-06-08 21:05:56 +01:00
drcrazy
93e324cc11 Fixed electric tree tap. Closes #1535 2018-06-08 15:46:28 +03:00
modmuss50
959e318859
Add energy storage to RebornCore's wrenableBlocks list 2018-05-26 20:38:47 +01:00
drcrazy
1ad23439eb Cleaned up supressed warnings 2018-05-25 14:24:35 +03:00
modmuss50
c20e1c72a9 Fixes #1515 2018-05-17 11:00:35 +01:00
drcrazy
ed9cdc7353 GUI update for assembly machine. Some work for #1512 2018-05-08 18:05:49 +03:00
modmuss50
1c10c199ae Fixes some issues with the storage chests, closes #1481 2018-05-04 12:06:40 +01:00
drcrazy
45669e8aa9 Formatting + set proper frame drop for advanced machines 2018-04-28 13:16:50 +03:00
drcrazy
649a6bf67f More sorting work. 2018-04-27 18:15:56 +03:00
drcrazy
de61d24082 Sorted out blocks between tiers 2018-04-27 18:06:57 +03:00
drcrazy
97e8fd7270 Changed names for parameters in createTE. 2018-04-27 17:54:19 +03:00
modmuss50
08a6d309d7
Fix server crash, closes #1495 and closes #1496 2018-04-22 13:22:09 +01:00
modmuss50
83e4ad98e1
Add configs to cables, closes #1491 2018-04-21 16:32:04 +01:00
modmuss50
53ce1828d1 Small tweaks 2018-04-18 17:33:11 +01:00
modmuss50
09a75893e4 Add larger fusion reactor sizes 2018-04-18 15:46:56 +01:00
modmuss50
10106715d3 Right click the fusion control computer with coils to autoplace them. 2018-04-18 15:07:28 +01:00
modmuss50
75b8c4d317
Fix #1485 2018-04-14 00:02:50 +01:00
modmuss50
9b23945670
Fix block inventory dropping in some situations 2018-04-12 15:42:09 +01:00
modmuss50
fbd4854f30
Fixes #1480 2018-04-12 13:42:55 +01:00
drcrazy
fef10740ba
Feature/fluidreplicator (#1482)
Added Fluid Replicator multiblock machine.
2018-04-12 15:42:12 +03:00
drcrazy
45361a6b46 Last piece of refactoring due to TileGenericMachine intro. 2018-04-02 18:12:58 +03:00
drcrazy
54ee781bc7 More refactoring for tier1 machines. 2018-04-02 16:58:03 +03:00
drcrazy
80e36f0427 Fixed typos for tier1 tiles folder. New abstract TR machine class 2018-04-02 16:18:48 +03:00
drcrazy
3e8b63645b Fixed license header. 2018-03-23 13:21:18 +03:00
modmuss50
453fd3856a Fix Quantum Chest holding its items when broken, fixes #1462 2018-03-19 09:26:16 +00:00
modmuss50
06f7f64efb
Add stone variants for the other end ores. 2018-03-10 20:18:53 +00:00
modmuss50
d7ce35428c
Add a config option to change the textures of the end ores to use the stone background.
I still need to add the other ores, but this is the main one that needs doing.
2018-03-09 19:57:20 +00:00
drcrazy
111ee7630a Updated API reference for recipes. 2018-03-05 14:45:23 +03:00
drcrazy
0ecdce2717 Made solar panels configurable. 2018-02-16 12:17:05 +03:00
modmuss50
9c7f1995a8
Update year in license 2018-02-11 14:08:13 +00:00
Dimmerworld
27dacb327a Alarm cleanup + tooltip and techreborn manual UI (#1437)
* Alarm cleanup and tooltip, Tech manual UI

* add peskty comma

* Compress png

* Rename to wiki and asked user before opening browser
2018-02-11 13:59:52 +00:00
Dimmerworld
9349ffe264 Update forge and Sound options for Alarm (#1435)
* Update forge and Sound options for Alarm

* Revert changes to gradle wrapper properties

* Cleanup imports

* Removed sneaky debugging stuff
2018-02-10 11:53:11 +00:00
drcrazy
73b2f36b24 Fixes for wrenching blocks. Closes #1417 and #1418 2018-01-26 12:27:58 +03:00
modmuss50
268a16958b Format + license headers. 2018-01-08 18:29:12 +00:00
modmuss50
2a0a9e5636 Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm 2018-01-08 17:45:29 +00:00
Dimmerworld
86d37514a7 Recipe for alarm and misc fixes 2018-01-03 15:17:20 +11:00
Dimmerworld
2177b72e41 Animation 2018-01-03 14:26:23 +11:00
Dimmerworld
bdc34d673c Proper faces 2017-12-29 16:50:35 +11:00
Dimmerworld
e93451b595 Woop woop - Alarm work (#1380)
* Alarm makeover

Model,
boundrybox, 
textures,
name  localization for the alarm

* Actual translations for Alarm

* Texture resize

As requested
(Didn't notice dimensions when I was grabbing off Prospector)
2017-12-26 01:30:36 +00:00
modmuss50
7594b55fb5
Start work on the alarm 2017-12-18 19:58:52 +00:00