Commit graph

4045 commits

Author SHA1 Message Date
modmuss50
bb6ff90f9b Refactor guis 2020-03-31 10:40:19 +01:00
modmuss50
9344eeb0ca Support latest energy version 2020-03-26 21:33:44 +00:00
modmuss50
333389c0d9 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-03-26 11:27:13 +00:00
modmuss50
ba9d2bbb3b Sodium explodes in water, closes #2069 2020-03-26 11:26:20 +00:00
modmuss50
4482c01ad0 Tag renames 2020-03-25 20:29:56 +00:00
modmuss50
11290e89e7 20w13a 2020-03-25 19:36:02 +00:00
modmuss50
8679c9398f Merge remote-tracking branch 'origin/1.16' into 1.16 2020-03-23 20:21:08 +00: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
shedaniel
8dae42d04a
Update REI to v4.1-unstable (#2063) 2020-03-19 14:23:52 +00:00
modmuss50
e4fb1773f3 20w12a 2020-03-18 20:58:31 +00:00
drcrazy
7138a8d45b Config for Oregen. Closes #2062 2020-03-18 17:20:48 +03:00
drcrazy
8f64355885 Buff Nano Saber damage. Closes #1714 2020-03-17 14:52:19 +03:00
Prospector
0817b70f55 Update almandine dust textures 2020-03-13 16:28:24 -07:00
Prospector
e3829cf44f Update some textures and rebalance a few recipes 2020-03-13 11:12:07 -07:00
modmuss50
99b2755887 Renames to match yarn changes 2020-03-12 20:56:44 +00:00
modmuss50
5b1e68d093 Support the new gold ore tag 2020-03-12 20:43:48 +00:00
modmuss50
e3749343e7 Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/compat/rei/MachineRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidgenerator/FluidGeneratorRecipeCategory.java
#	src/main/java/techreborn/compat/rei/fluidreplicator/FluidReplicatorRecipeCategory.java
2020-03-12 20:33:54 +00:00
modmuss50
f60daa7376 Merge remote-tracking branch 'origin/1.16' into 1.16
# Conflicts:
#	build.gradle
#	src/main/java/techreborn/init/TRArmorMaterials.java
2020-03-12 20:32:39 +00:00
modmuss50
adad632549 initial 20w11a 2020-03-12 20:32:03 +00:00
drcrazy
416fbbf607 Allow to keep enchants only for TR items. Closes #1952 2020-03-10 13:51:34 +03:00
drcrazy
3e3ca8dd41 Enchants persist through crafting. Some work on #1952 2020-03-10 10:11:07 +03:00
modmuss50
f99d822cf2 Fix https://github.com/TechReborn/TechReborn/issues/2055 2020-03-06 12:26:48 +00:00
modmuss50
a88d34b87f
improved rei compat (#2054) 2020-03-05 19:24:29 +00:00
Milan
1de7b3afd2
20w08a (#2052)
* 20w08a

* update REI and libCD
2020-02-25 18:00:15 +00:00
drcrazy
3920ff79d9 End crystals can be used in implosion compressor. Closes #2027 2020-02-22 12:58:26 +03:00
drcrazy
ebc2282c9f Added recipe fo flint dust from flint in grinder. Closes #2044 2020-02-18 14:12:32 +03:00
drcrazy
af8bd7ae8c Bump Omni-tool damage. Closes #2043 2020-02-18 11:03:26 +03:00
drcrazy
6824caa3f5 Tags for most of ingredients. Thanks to justastranger 2020-02-18 10:49:42 +03:00
modmuss50
dffec285b2 1.16 2020-02-12 18:36:01 +00:00
modmuss50
b0d3b3b77d Should fix #2033 2020-02-12 18:05:58 +00:00
Jessi Aurora
89aa42e62d
Recipe to get quartz dust from various sources/products of quartz (#2038). Thanks to Jessifir
* Add quartz to quartz dust recipe to grinder
* Add grinder recipe to produce quarts dust from diorite
* Add grinder recipe to produce quarts dust from granite
* Add grinder recipe to produce quarts dust from quartz blocks
2020-02-12 11:56:39 +03:00
Jessi Aurora
eec531465b
Add (vanilla) blasting recipes for ores/dusts (#2039). Thanks to Jessifir
* Add (vanilla) blasting recipes for all ores/dusts that can be smelted in a furnace
2020-02-12 11:54:51 +03:00
drcrazy
b9a36270a6 Assembly machine got usage in REI. Closes #2034 2020-02-10 21:44:39 +03:00
drcrazy
c2f387f1ae AESU stores inventory correctly. Closes #2018 2020-02-10 21:33:21 +03:00
Jessi Aurora
bc0af95053
Fix potential abuse with golden apple recipes (#2029). Thanks to Jessifir 2020-02-06 17:01:03 +03:00
modmuss50
b9351e33a1 Should actually fix the treetap. Closes #2022 2020-01-29 15:17:28 +00:00
drcrazy
162e4bbbee Added quartz dust. Closes #2012 2020-01-27 16:30:30 +03:00
drcrazy
bb206e9f41 Steel could be made with carbon cell. Some work on #2012 2020-01-27 12:22:45 +03:00
drcrazy
16ca412227 Steel could be made with carbon cell. Some work on #2012 2020-01-27 12:22:19 +03:00
Kato
9e67ab5725 Check rubber logs for sap from the ground level. (#2015)
Rubber logs can be put down manually, and it's not a given that the most bottom log is at the greenhouse's level.  In practice, with the ground made up out of rubber logs, there will be sap on logs at y == 0.
2020-01-26 18:18:25 +00:00
modmuss50
adf5c7aba2 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-26 18:18:04 +00:00
modmuss50
015d81ad24 Fix #2013 2020-01-26 18:17:56 +00:00
drcrazy
8f5318b6bb Nerf glowstone grinder recipe. 2020-01-25 20:53:50 +03:00
drcrazy
0eb89ee122 Drills use energy to mine. Closes #2007 2020-01-25 20:51:03 +03:00
drcrazy
1cb6623dd7 Review nanosaber config 2020-01-24 16:01:56 +03:00
drcrazy
9cccc70071 Review treetap, chainsaw and jackhammer configs 2020-01-24 12:54:37 +03:00
modmuss50
a06afa1a4a Redstone config polish 2020-01-23 13:53:16 +00:00
modmuss50
3b2da8b510 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-22 16:20:42 +00:00
modmuss50
04b8b2f266 Possibly fix 1.15.1 support. Should fix #1989 2020-01-22 16:19:26 +00:00
Prospector
6725fd30a1 Update to latest yarn 2020-01-21 22:00:54 -08:00
modmuss50
147eec26f6 Fix missed mapping. #releaseBuild 2020-01-21 15:50:33 +00:00
drcrazy
f3333832ac Review Drills configs 2020-01-21 16:56:08 +03:00
drcrazy
74d96e4670 Fix hologram for distillation tower. 2020-01-21 16:29:10 +03:00
drcrazy
d023329de9 Quantum chest now extinguish fire. 2020-01-21 15:19:59 +03:00
drcrazy
bf730cd5a4 Fix TNT usage in implosion compressor 2020-01-21 14:58:14 +03:00
drcrazy
1458716d12 Stripped log got rubber. Closes #1986 2020-01-21 14:28:07 +03:00
drcrazy
3e441a7aed Recipe for gunpowder 2020-01-21 14:13:18 +03:00
drcrazy
ae691fcfc5 LESU I\O logic change. Closes #1978 2020-01-21 01:52:52 +03:00
modmuss50
3ca34f79a5 Gui tabs cleanup 2020-01-20 21:56:05 +00:00
drcrazy
30a9aa2324 Buff grinder glowstone dust recipe. 2020-01-20 19:38:05 +03:00
modmuss50
f7c664fc25 Update mappings 2020-01-18 18:00:04 +00: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
drcrazy
a543a562b2 Fix industrial jackhammer AOE mining. Closes #1975 2020-01-14 02:22:06 +03:00
drcrazy
2aa2f6d7bb Adjusted recipes for storage units. Closes #1979 2020-01-13 21:42:46 +03:00
drcrazy
e16e5e3d1d Adjusted recipes for storage units. 2020-01-13 21:20:26 +03:00
drcrazy
357efe21aa Recipes for fluid tanks upgrades to next tier. Closes #1953 2020-01-13 18:04:52 +03:00
drcrazy
70789d3ce0 Sweet berries and kelp got their methane and plantball recipes. Closes #1977 2020-01-13 16:19:54 +03:00
drcrazy
728d4affbe Sweet berries centrifuge recipe. Some work on #1977 2020-01-13 15:55:26 +03:00
drcrazy
342043dbba Lineup batteries and energy storages. 2020-01-13 15:38:23 +03:00
drcrazy
b9c8a1a215 Slight cleanup. Energy packs uses transfer rates from tier. 2020-01-13 13:53:36 +03:00
Prospector
04a1c789c4 Seriously clean up loads of unnecessary item classes and add more configs 2020-01-12 21:20:42 -08:00
Prospector
c4dcc8d870 Move a couple advanced unit recipes in the wrong spot 2020-01-12 19:29:37 -08:00
Prospector
960b064b5a Fix various issues relating to armor [Fixes #1952] 2020-01-12 19:17:35 -08:00
Prospector
bcc9368bf9 Minor fix to enchanted golden apple's centrifuge recipe 2020-01-12 18:37:39 -08:00
modmuss50
7e6f0d1906 Merge remote-tracking branch 'origin/1.15' into 1.15 2020-01-12 18:40:30 +00:00
modmuss50
bd25b11908 Turbine rendering, thanks Spearkiller for the textures and model 2020-01-12 18:40:21 +00:00
Justin Vitale
0ff1e2b73e (Spearkiller) Properly capitalize advancement titles 2020-01-12 18:28:31 +11:00
Justin Vitale
f2138e034f Fix for fix #1971- Accounted for <= 64 stacks thus not in stored stack 2020-01-12 09:18:48 +11:00
drcrazy
eb9abe4c74 Sulfur dust got some usage. Closes #1945 2020-01-11 23:08:00 +03:00
modmuss50
3b4d135fd4 Fix #1971 2020-01-11 13:29:22 +00:00
modmuss50
c1097a5cd8 Get the light from infront of the storage unit 2020-01-11 13:18:21 +00:00
Justin Vitale
d728cd70d8
Merge pull request #1972 from vhd/bugfix/reinforced-glass-rendering
Fix reinforced glass rendering
2020-01-11 22:15:51 +11:00
vhd
9dc063e153 Fix reinforced glass rendering 2020-01-11 11:49:22 +02:00
vhd
e4bc2a0cb7 Powered items should be indestructible now (#1970) 2020-01-10 21:49:14 +00:00
vhd
f1731fe925 Slightly better REI fluid handling. (#1968)
- now you can jump between fluid/cells/buckets when looking for recipes
2020-01-10 21:05:05 +00:00
vhd
9e1b1a76e1 Added config for machines crafting sound (#1969) 2020-01-10 21:03:58 +00:00
modmuss50
bc47a03451 Keep energy in items when crafting 2020-01-10 17:33:20 +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
drcrazy
3f2f186b56 Buff ruby dust to chrome dust recipe. Closes #1955 2020-01-10 01:55:12 +03:00
drcrazy
985bef6dae Superconductor cable now craftable. Closes #1962 2020-01-09 17:45:12 +03:00
drcrazy
88c0aca954 Fix fusion reactor power gen. Closes #1961 2020-01-09 16:33:32 +03:00
vhd
5e3341df21 Fix more UU-matter recipes. Kudos to vhd. Closes #1959 2020-01-09 14:16:24 +03:00
drcrazy
39617f61c0 FIx some of UU-matter recipes in a hacky way 2020-01-09 13:43:40 +03:00
drcrazy
1d053bb592 Make electric tools enchantable on table. Closes #1944 2020-01-08 16:45:33 +03:00
drcrazy
0f56adbc9e Storage Units should render content being stored. 2020-01-07 23:25:48 +03:00
drcrazy
f36c0cd3c6 Fix tank fluid tooltip. Closes #1958 2020-01-05 17:40:52 +03:00
modmuss50
f61cec6506 Fix #1949 2020-01-05 11:44:59 +00:00
modmuss50
42afb3528c Fix #1957 and Fix #1951 2020-01-05 11:38:23 +00:00
drcrazy
525f956e0d BUff Industrial Jackhammer. Some work on #1944 2020-01-04 23:31:58 +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
drcrazy
f5360f8416 Fix tooltip for energy storage. 2020-01-03 17:20:50 +03:00
drcrazy
55e56c3962 Added leather recipe for chemical reactor. 2020-01-03 15:56:13 +03:00
drcrazy
d127e43fee Change iridium from ingot to plate in Iridium alloy plate recipe. 2020-01-03 15:29:19 +03:00
drcrazy
9690f780ff Do not pass to second hand after cell use on block. 2020-01-03 15:16:29 +03: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
modmuss50
2fc9557516 Fix the LESU not working 2020-01-01 16:05:23 +00:00
modmuss50
de4c14542b Update to new reborn core 2020-01-01 15:58:16 +00:00
drcrazy
65a429a4e3 Fix rotation with wrench. Closes #1940 2020-01-01 15:08:40 +03:00
drcrazy
c5694575f7 More recipes for assembling machine 2019-12-30 20:07:05 +03:00
drcrazy
cfc9b4af6a Revert textures for circuits 2019-12-30 18:58:54 +03:00
drcrazy
ad1ec32b57 Fix for lava cell amount in centrifuge. 2019-12-30 18:55:01 +03:00
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
vhd
0a038d78e9 Some recipe fixes (#1929) 2019-12-28 09:24:21 +00: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
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
drcrazy
b298727563 Fix Cloaking Device 2019-12-17 17:36:24 +03: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