Commit graph

4660 commits

Author SHA1 Message Date
drcrazy
6d514766ed Fixes for AdvancedJackhammer AOE mining. Closes #1935 2019-12-30 14:26:19 +03:00
vhd
52de2fc59f Added configurable recycler blacklist (#1934)
* Added configurable recycler blacklist. Defaulted to scrap and scrap_box

* Fix for bronze dust centrifuge dupe
2019-12-29 19:48:00 +00: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
8a4baa8d27 Update issue templates 2019-12-29 02:12:10 +03:00
drcrazy
133eb35b42 Update issue templates 2019-12-29 02:11:06 +03:00
vhd
0a038d78e9 Some recipe fixes (#1929) 2019-12-28 09:24:21 +00:00
drcrazy
b972de847a #releaseBuild 2019-12-26 15:32:52 +03:00
drcrazy
4a85c25b49 Fixed usage of tags in updated recipes 2019-12-26 15:26:18 +03:00
Justin Vitale
58f48c44c9 50 advancements and other minor changes (#1927)
* Advancements!!!!!!!11111elevenoneone
* Update REI from 3.2.25 to 3.2.31
2019-12-26 15:07:34 +03:00
drcrazy
0cbb900605 More silver usage 2019-12-26 12:18:10 +03:00
drcrazy
b9db70b474 More lead usage 2019-12-26 12:01:26 +03:00
drcrazy
12585d3949 Make some use of lead 2019-12-26 11:48:11 +03:00
drcrazy
c7b23a581e Fix drop for some rubber stuff 2019-12-26 10:04:22 +03:00
drcrazy
a99acbfd41 Air is not a fuel. Closes #1922 2019-12-25 16:14:24 +03:00
drcrazy
a37a6e29a5 Fix electric furnace energy usage. Closes #1920 2019-12-25 03:49:11 +03:00
drcrazy
99b2342a1c Make JackHammer great again. 2019-12-25 03:39:46 +03:00
vhd
f7661681bc Temporary fix for REI fluid cells integration (#1921) 2019-12-24 22:15:40 +00:00
modmuss50
d4abd56a3c minor fix to the chunk loader 2019-12-24 21:41:41 +00:00
drcrazy
c4ecef5dcb Remove block moved to utils 2019-12-24 18:40:22 +03:00
drcrazy
06b4af59bc Fix damage and speed for gem tools. 2019-12-24 15:58:16 +03:00
drcrazy
562d333be9 Active\Inactive switch moved to RC. 2019-12-24 11:00:21 +03:00
drcrazy
ecb63b5a6b TR root advancement fixed 2019-12-23 22:13:13 +03:00
drcrazy
0de4110f96 Check for energy in tools moved to RC. 2019-12-23 17:56:42 +03:00
drcrazy
e6707b2ddd Active\Inactive tooltip moved to RC. 2019-12-23 17:21:33 +03:00
drcrazy
6dc1124bc6 Energy storage should drop inventory. Closes #1919 2019-12-23 13:06:18 +03:00
drcrazy
2afca5534b Stripped log got it's drop 2019-12-23 12:36:30 +03:00
drcrazy
8c19a6bbc9 There is no steel in basic tools 2019-12-23 12:24:35 +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
modmuss50
34074d7a8a Readme updates 2019-12-22 18:09:33 +00:00
modmuss50
4cc07abe90 Merge remote-tracking branch 'origin/1.15' into 1.15 2019-12-22 18:01:27 +00:00
modmuss50
8ba6c25fc5 Fix #1915 2019-12-22 18:01:19 +00:00
vhd
6918f8dd60 REI integration for fluid generators (#1916) 2019-12-22 17:58:58 +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
drcrazy
73f0ff98e4 Fix drop for wire mill. Some work on #1914 2019-12-20 03:03:22 +03:00
modmuss50
5e767e97f0 #releaseBuild 2019-12-18 11:30:55 +00:00
drcrazy
b298727563 Fix Cloaking Device 2019-12-17 17:36:24 +03:00
modmuss50
1f0fa709bc Bump version 2019-12-17 02:00:12 +00:00
modmuss50
6086bc0f0c Quantum Armor
Have fun, sorry it took years
2019-12-17 01:58:51 +00:00
modmuss50
2ce0421ae6 Merge remote-tracking branch 'origin/1.15' into 1.15 2019-12-16 21:31:06 +00:00
modmuss50
1d4817387b Fix #1911 2019-12-16 21:30:28 +00:00
Prospector
de4c65489d Update cable textures (#1910) 2019-12-16 20:42:09 +00:00
modmuss50
801693cedc #releaseBuild 2019-12-16 20:14:39 +00:00
modmuss50
8b03986d15 Use RebornCore's ExtendedRecipeRemainder in the auto crafting table 2019-12-16 19:48:18 +00:00
modmuss50
727bd418fa Waterloggable fixes with the cell and cables 2019-12-16 19:03:58 +00:00
modmuss50
86fdbae7b2 Cleanup maven pom, hopefully I havent broken anything. 2019-12-16 18:56:19 +00:00
drcrazy
9b496c0a1a Update fabric-api, rei, towelette 2019-12-16 18:34:18 +03:00
modmuss50
0d5f37c6b7 #releaseBuild 2019-12-15 19:46:36 +00:00
modmuss50
1e6e80a9c2 Set curse version to 1.15 2019-12-15 19:45:57 +00:00
modmuss50
88eb3a646e Water and Electricity
Closes #1907
2019-12-15 19:33:50 +00:00