modmuss50
7ccd5bcebd
20w17a compile pass
2020-04-26 16:29:38 +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
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
modmuss50
55f9a5df52
20w15a
2020-04-09 01:47:11 +01: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
49e1ce3c2e
Add constructor that allows passing a custom Block.Settings
2020-03-31 23:14:03 +01:00
modmuss50
bb6ff90f9b
Refactor guis
2020-03-31 10:40:19 +01:00
modmuss50
11290e89e7
20w13a
2020-03-25 19:36:02 +00:00
modmuss50
e4fb1773f3
20w12a
2020-03-18 20:58:31 +00: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
modmuss50
b9351e33a1
Should actually fix the treetap. Closes #2022
2020-01-29 15:17:28 +00:00
modmuss50
015d81ad24
Fix #2013
2020-01-26 18:17:56 +00:00
vhd
9dc063e153
Fix reinforced glass rendering
2020-01-11 11:49:22 +02:00
vhd
d1b395f3e4
Cables can now be covered. Thanks to vhd. Closes #1954
2020-01-10 18:07:02 +03: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
65a429a4e3
Fix rotation with wrench. Closes #1940
2020-01-01 15:08:40 +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
drcrazy
5e9e0f3c2b
Omnitool WIP mark lost
2019-12-20 16:34:42 +03: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
727bd418fa
Waterloggable fixes with the cell and cables
2019-12-16 19:03:58 +00:00
modmuss50
88eb3a646e
Water and Electricity
...
Closes #1907
2019-12-15 19:33:50 +00:00
drcrazy
fff1b0c107
License + imports
2019-12-13 11:36:51 +03:00
modmuss50
d04e1d7dec
Performance improvements
2019-12-08 22:13:36 +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
e48d1f1184
Pre 4 mappings
2019-12-04 16:49:53 +00:00
modmuss50
0cf6d7e888
Fix auto coil placement in some cases
2019-11-26 20:36:25 +00:00
modmuss50
bfdde04892
1.15-pre2 loads of new mappings
2019-11-26 19:03:36 +00:00
modmuss50
6cb919b9a2
Fix rubber trees #betaBuild
2019-11-22 21:05:40 +00:00
modmuss50
c8ce611841
1.15-pre1
2019-11-21 21:51:30 +00:00
modmuss50
977ac8f8a8
merge fixes
2019-11-14 19:09:32 +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
9314899b08
Fix #1873
2019-10-28 21:10:12 +00: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
drcrazy
f77bc65316
Solar panels got their tooltip back.
2019-09-27 16:29:29 +03:00
modmuss50
7f4fb6d80b
Cleanup
2019-09-22 13:01:34 +01:00
modmuss50
3fe62e2c77
19w38b
2019-09-21 13:01:38 +01:00
modmuss50
2d8961589d
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/client/render/DynamicBucketBakedModel.java
# src/main/java/techreborn/client/render/DynamicCellBakedModel.java
2019-09-21 12:36:37 +01:00
drcrazy
666e8f03b2
Fix crash with lamp
2019-09-16 12:53:09 +03:00
modmuss50
7e05b0da12
Merge branch 'power' into 1.14.4
2019-09-15 19:15:39 +01:00
modmuss50
aa6eb60d46
Finish porting to new power api
2019-09-15 19:14:42 +01:00
modmuss50
ab15533351
Fix #1833
2019-09-15 13:30:05 +01:00
modmuss50
6e53132c59
Merge remote-tracking branch 'remotes/origin/1.14' into 1.15
2019-09-12 16:55:52 +01:00
modmuss50
8c9c736da9
19w37a
2019-09-12 16:55:41 +01:00