Commit graph

1085 commits

Author SHA1 Message Date
modmuss50
d92343f5a7 Add stair, slab and wall blocks for all metal storage blocks 2020-06-28 16:13:39 +01:00
Justin Vitale
c0f1e50ecd Remove everything related to depreciated digital & quantum chest + tank 2020-06-19 22:37:44 +10:00
modmuss50
71a0a631ff remove usages of reflection, should help cut down on errors and IDE warnings. 2020-06-18 13:50:50 +01:00
Justin Vitale
704dc06961 Import cleanup and reorganization 2020-06-18 22:41:34 +10:00
Justin Vitale
390d9f7059 Merge branch '1.15' into 1.16
Need to fix up storage unit UI
2020-06-18 22:39:26 +10:00
drcrazy
4e17c87ca4 Updated FabricBlockSettings 2020-06-09 17:02:06 +03:00
modmuss50
ae1a26156a 20w22a 2020-06-01 22:37:43 +01:00
modmuss50
bbc4b2b765 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/ModLoot.java
2020-06-01 22:25:00 +01:00
modmuss50
8c39008636 20w21a 2020-05-21 23:00:12 +01:00
drcrazy
2e67d56225 Saplings are back in Overworld chests. Some work on #2100 2020-05-06 14:43:19 +03:00
modmuss50
862db8a4ab 20w18a 2020-05-02 23:39:28 +01:00
modmuss50
71d88ae44a Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	src/main/java/techreborn/events/ModRegistry.java
2020-04-26 00:28:17 +01:00
modmuss50
047c57c918 fix license warnings 2020-04-26 00:22:24 +01:00
modmuss50
e8a6d801f9 Fix #2097 2020-04-25 23:57:09 +01:00
haykam821
99a2a28d91
Add rubber wood and stripped rubber wood (#2086). Thanks to haykam821
* Make rubber wood block names consistent with vanilla
* Add rubber wood
* Add stripped rubber wood
* Add block and item tags for rubber logs
* Allow crafting all types of rubber logs into rubber planks
* Allow extracting rubber from rubber wood and stripped rubber wood
2020-04-17 14:28:59 +03:00
drcrazy
7b672244c3 Ore spawn rates config. Closes #2087 2020-04-16 14:50:00 +03:00
modmuss50
0bf6159801 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/client/GuiHandler.java
2020-04-09 00:55:38 +01:00
modmuss50
bb6ff90f9b Refactor guis 2020-03-31 10:40:19 +01:00
modmuss50
acf59dd1a5 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
#	src/main/java/techreborn/items/armor/BatpackItem.java
2020-03-23 20:19:53 +00:00
Prospector
e3829cf44f Update some textures and rebalance a few recipes 2020-03-13 11:12:07 -07:00
modmuss50
adad632549 initial 20w11a 2020-03-12 20:32:03 +00:00
modmuss50
dffec285b2 1.16 2020-02-12 18:36:01 +00:00
drcrazy
162e4bbbee Added quartz dust. Closes #2012 2020-01-27 16:30:30 +03:00
modmuss50
1202a1c588 1.15.2 - mainly mapping updates. Will be backwards compatible with 1.15.1 and 1.15 2020-01-15 12:07:52 +00:00
Prospector
960b064b5a Fix various issues relating to armor [Fixes #1952] 2020-01-12 19:17:35 -08:00
vhd
9e1b1a76e1 Added config for machines crafting sound (#1969) 2020-01-10 21:03:58 +00:00
vhd
d1b395f3e4 Cables can now be covered. Thanks to vhd. Closes #1954 2020-01-10 18:07:02 +03:00
drcrazy
a115fbd736 Dispenser can use cells. Closes #1948 2020-01-10 16:09:03 +03:00
drcrazy
8db5cea07c Refactoring for Scrapbox Dispenser behaviour. 2020-01-10 04:01:53 +03:00
Justin Vitale
5d89272a10 Add WIP textured drain block without logic 2020-01-04 16:18:34 +11:00
Justin Vitale
a98eff45af Removed magic energy converter and absorber (Revert to undo)
Associated translations and textures also removed
2020-01-04 14:29:11 +11:00
Justin Vitale
9aeddd204a WIP tag to interface, capacity spacing fix, removed Supercondensator
Sidenote: Also renamed DocumentAssistUtils to ToolTipAssistUtils.
2020-01-04 14:20:57 +11:00
modmuss50
7b99e2e9b7 License updates + fixes 2020-01-03 22:46:07 +00:00
Justin Vitale
9328c47bed Tiered tank and storage blocks, GUI improvements, refactoring, cell nerf and misc organisation (#1932)
Tanks, storage blocks and variouse stuff. Thanks to Dimmerworld!!
2020-01-03 00:24:46 +03:00
drcrazy
6d514766ed Fixes for AdvancedJackhammer AOE mining. Closes #1935 2019-12-30 14:26:19 +03:00
vhd
4f45a63a7a [Proposal] Greenhouse Controller (aka Farming Station) (#1928)
* Added Greenhouse Controller (aka Farming Station)

* Greenhouse tiny code cleanup

* Greenhouse Controller can collect sap
2019-12-29 14:06:56 +00:00
drcrazy
06b4af59bc Fix damage and speed for gem tools. 2019-12-24 15:58:16 +03:00
drcrazy
6dc1124bc6 Energy storage should drop inventory. Closes #1919 2019-12-23 13:06:18 +03:00
Justin Vitale
3dbc7feb62 #1913 Improved in-game documentation via tooltips for both machines & upgrades and solar panel exception fix (#1917)
* Overclocker and energy storage tooltip added

* Add default constructor to fix NoSuchMethodException

java.lang.NoSuchMethodException when loading world with existing solar panels

* Base Upgrade tooltips (Might move to reborn core)

* Migrated to tooltip callback and added most machine infos

* Optimize imports of stuff previously touched

* Added more informationtips and cleanup

* Revert itemUpgrade formatting

* Final touches

* Readd easter eggs, multi-line tips and translation updates

Easter egg tooltips are now restricted to only ctrl-hover
2019-12-22 22:53:01 +00:00
Justin Vitale
b2f4804987 Solar panel GUI & internal storage plus misc spelling fixes (#1912)
* Solar panel GUI & internal storage plus misc spelling fixes

* Pullrequest fixes and recipe changes
2019-12-20 12:53:23 +00:00
modmuss50
6086bc0f0c Quantum Armor
Have fun, sorry it took years
2019-12-17 01:58:51 +00:00
Juuxel
87a36d1c23 Add comparator support for energy storage and generator blocks (#1901)
* Add comparator support for energy storage blocks

Does not update automatically yet, so there needs to be a call to
World.updateHorizontalAdjacent.

* Switch to ceil() in energy storage comparator calculation

Should prevent low amounts of energy of rounding to 0.

* Add comparator support to generators

Requires TechReborn/RebornCore#132.
2019-12-07 18:36:41 +00:00
modmuss50
d5e89c5e20 Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/blocks/misc/BlockRubberLog.java
2019-11-14 19:03:36 +00:00
modmuss50
a984263b04 inital 19w46a port 2019-11-14 18:37:42 +00:00
modmuss50
c90e6389a8 Fix #1867 2019-10-26 21:59:55 +01:00
drcrazy
264224a6f9 Stripped version of Rubber Log. 2019-10-08 13:03:01 +03:00
drcrazy
106b8e25ba Fix tooltip for cables and typo for solar panels. 2019-09-27 16:42:17 +03:00
modmuss50
7e05b0da12 Merge branch 'power' into 1.14.4 2019-09-15 19:15:39 +01:00
modmuss50
ab15533351 Fix #1833 2019-09-15 13:30:05 +01:00
modmuss50
4f80a8c651 start on new power api 2019-09-10 14:09:15 +01:00