Commit graph

1098 commits

Author SHA1 Message Date
drcrazy
efad3e6411 Formatting for PlayerDetectorBlock 2020-09-08 16:00:20 +03:00
modmuss50
cfd9c7f10c Rewrite world gen, in preperation for json based config files 2020-08-02 15:41:28 +01:00
modmuss50
6e0fc6af61 first pass on 1.16.2 - no world gen 2020-07-29 19:42:39 +01:00
modmuss50
a1e3df3c4a Rebalance drill speed and mining level 2020-07-26 15:56:05 +01:00
modmuss50
18a08b798e Merge remote-tracking branch 'origin/1.16' into 1.16
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
2020-07-25 00:23:59 +01:00
modmuss50
0106b00add Fix (well add) ore mining levels 2020-07-24 23:56:47 +01:00
drcrazy
7643220d4b Stairs, Walls and Slabs got their names 2020-07-11 21:34:37 +03:00
drcrazy
246789c30c FabricBlockSettings updated to v1 2020-07-11 20:53:39 +03:00
Justin Vitale
c4ef977f16 Refactor and import cleanup (Excluding network PR changed files) 2020-07-09 23:04:42 +10:00
Justin Vitale
856f66eeb0 Resin basin finished (Recipe, functionality, textures, models) 2020-07-08 01:06:34 +10:00
Justin Vitale
90c23b9d57 Refactor and cleanup, awaiting new model. 2020-07-02 17:20:50 +10:00
Justin Vitale
6dc00090d1 Add sapper base logic code (MVP) along with rest of it 2020-07-02 02:37:36 +10:00
modmuss50
4670d6813e Recipes 2020-06-28 16:25:17 +01:00
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