Justin Vitale
025740d8ee
Drain block for liquid gathering
...
https://wiki.techreborn.ovh/doku.php?id=mods:techreborn:drain
2020-06-18 21:39:40 +10:00
Justin Vitale
f915c4619d
Fix typo in basalt recipe
2020-06-13 16:58:07 +10:00
Justin Vitale
62fb5f632a
Cobblestone > Gravel > Sand grinder flow #2107
...
Don't see anything inherently wrong with this, most packs do it this way anyways.
2020-06-13 00:47:38 +10:00
Justin Vitale
f66e7019f9
Basalt, marble, andesite and granite craftable #2046
...
basalt from coal & obsidian small dust
marble from diorite dust an obsidian small dust
andesite dust from andesite
granite dust from granite (no longer makes quartz)
2020-06-13 00:36:45 +10:00
Justin Vitale
10dc7b114e
Diorite dust from diorite blocks instead of quartz #2046
...
Quartz dust can be crafted via quartz in grinder
2020-06-13 00:10:51 +10:00
Justin Vitale
8b548baf56
Compress prismarine crystals to shards (Reverse recipe) #2046
2020-06-12 22:07:49 +10:00
drcrazy
4e17c87ca4
Updated FabricBlockSettings
2020-06-09 17:02:06 +03:00
drcrazy
c3d405e4f4
StorageUnitBlock: Implement locking mechanism ( #2124 ). Thanks to Sturmlilie
2020-06-09 16:30:40 +03:00
modmuss50
ffc4c1643e
1.16-pre2
2020-06-05 16:03:22 +01:00
modmuss50
ae1a26156a
20w22a
2020-06-01 22:37:43 +01:00
modmuss50
17453d7edd
post merge compile fix
2020-06-01 22:25:51 +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
shedaniel
ed5478c8b7
Show tooltip only for TR items. Kudos to Shedaniel ( #2122 )
2020-05-26 14:52:58 +03:00
modmuss50
3e2753affb
Example of using the WIP Screen handler API
2020-05-25 12:55:08 +01:00
modmuss50
43d8759444
Remove towelette bug fix.
2020-05-22 15:27:54 +01:00
modmuss50
8c39008636
20w21a
2020-05-21 23:00:12 +01:00
drcrazy
fdc6f88dbc
Solar panels will work in Nether and The End. Closes #2105
2020-05-06 15:08:46 +03:00
drcrazy
2e67d56225
Saplings are back in Overworld chests. Some work on #2100
2020-05-06 14:43:19 +03:00
drcrazy
273401473c
Fix quantum tank advancement. Closes #2096
2020-05-04 13:38:38 +03:00
modmuss50
f5d8cd2f53
Rework rubber tree generation
2020-05-03 00:04:55 +01:00
modmuss50
862db8a4ab
20w18a
2020-05-02 23:39:28 +01:00
modmuss50
8051e0cfbb
Fix some issues
2020-04-26 19:39:06 +01:00
modmuss50
7ccd5bcebd
20w17a compile pass
2020-04-26 16:29:38 +01:00
modmuss50
178e0937d5
Fix bad merge
2020-04-26 00:34:23 +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
Sturmlilie
d68888df57
Blockus compatibility (1.15+) ( #2091 )
...
* Balance marble dust centrifuge input/output item counts
* Add recipes using blockus items
2020-04-25 14:48:56 +01:00
Sturmlilie
4fe8f5381a
Allow grinding of vanilla basalt blocks ( #2094 )
2020-04-20 14:08:17 +01:00
drcrazy
350d1fada6
More usage of rubber wood
2020-04-17 14:54:48 +03: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
6c48584ae5
Fix #2083
2020-04-11 15:45:02 +01:00
modmuss50
a6005851a7
Merge fixes
2020-04-11 15:42:09 +01:00
modmuss50
c2e74f070d
Merge remote-tracking branch 'remotes/origin/1.15' into 1.16
...
# Conflicts:
# build.gradle
2020-04-11 15:40:23 +01:00
modmuss50
e6533f0a97
Fix #2084
2020-04-11 15:27:24 +01:00
modmuss50
9612c82cd3
Display flying when an elytra is used with the trinkets mod. Closes #2074
2020-04-11 15:12:13 +01:00
modmuss50
8b16fe191b
Fix #2070
2020-04-11 14:51:02 +01:00
modmuss50
1625920fef
Add plant products to the Composter. Fixes #2075
2020-04-11 14:44:41 +01:00
drcrazy
458a4b8e45
Fix cloaking device texture. Closes #2067
2020-04-09 14:51:12 +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
drcrazy
294f4b5454
Rubber trees are less frequent and have configs. Closes #2079
2020-04-06 14:24:35 +03:00
drcrazy
0845b923b5
More fixes for unused configs
2020-04-06 14:05:44 +03:00
drcrazy
35e4675c6d
Fix copper oregen config typo
2020-04-06 14:00:54 +03: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
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
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
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
88eb3a646e
Water and Electricity
...
Closes #1907
2019-12-15 19:33:50 +00:00
Prospector
ac1a93a1b2
Add Team Reborn as an author to improve searchibility in Mod Menu ( #1908 )
2019-12-15 19:16:04 +00:00
modmuss50
2852e98901
Chainsaw fixes
2019-12-13 14:14:58 +00:00
modmuss50
bd81ca48f6
Auto crafting table fixes and improvements.
...
This now uses the same logic that the rolling machine uses to balance recipes.1.15
Fixes #1891
2019-12-13 10:39:53 +00:00
modmuss50
e171d0eabc
Remove duplicate annotations.
2019-12-13 10:00:59 +00:00
modmuss50
dd2125158d
fix config issues
2019-12-13 09:50:21 +00:00
drcrazy
fb62c61ea6
Gems added to 'c' tag. Closes #1906
2019-12-13 12:19:28 +03:00
drcrazy
fff1b0c107
License + imports
2019-12-13 11:36:51 +03:00
modmuss50
5e5e997b93
Move most int fluid values to FluidValue.
...
This has been done to make it easier in the future to move to a new fluid system.
Some work is still needed (in recipes mainly) to move away fully away from mb. This should work identically to the old system for now.
2019-12-12 12:42:33 +00:00
Meredith Espinosa
649d28d63c
update to new libcd! ( #1902 )
2019-12-10 07:31:32 +00: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
4764271967
Fix #1900
2019-12-05 19:01:56 +00:00
modmuss50
7306638593
Fix #1898
2019-12-04 17:21:09 +00:00
modmuss50
375fb83e70
Fixed #1899
2019-12-04 17:08:20 +00:00
modmuss50
e48d1f1184
Pre 4 mappings
2019-12-04 16:49:53 +00:00
modmuss50
a0fbc1ccb3
More fixes
2019-11-28 21:12:36 +00:00
modmuss50
b01eb38863
Fix a few more issues with the fusion reactor
2019-11-28 21:10:08 +00:00
modmuss50
d7cfbcd443
Cleanup
2019-11-28 17:15:46 +00:00
Yoghurt4C
b0d548cdf6
advanced fabric-mining-levels.jar integration ( #1895 )
...
* advanced fabric-mining-levels.jar integration
* ace of spades
2019-11-28 17:00:07 +00:00
modmuss50
797e66f8ca
Fix fusion reactor closes #1894
2019-11-28 16:59:27 +00:00
modmuss50
46e2c143bc
Fix fusion reactor not always working.
2019-11-26 20:42:34 +00:00
modmuss50
0cf6d7e888
Fix auto coil placement in some cases
2019-11-26 20:36:25 +00:00
modmuss50
57c8ebdb3d
multiblock render changes
2019-11-26 20:19:57 +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
6504c24706
Fix server crash
2019-11-21 22:03:44 +00:00
modmuss50
bc57e38828
Merge remote-tracking branch 'origin/1.15' into 1.15
2019-11-21 21:51:38 +00:00
modmuss50
c8ce611841
1.15-pre1
2019-11-21 21:51:30 +00:00
shedaniel
16fe02f359
FIx REI Compat for 1.15 snapshots ( #1888 )
2019-11-15 17:17:06 +00:00
modmuss50
f9b9279500
Fix some block render layers
2019-11-14 20:06:45 +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
shedaniel
8ecfa4207a
Some REI Compat Changes ( #1882 )
...
* Update REi
* Update to 3.2.6
2019-11-07 14:46:19 +00:00
drcrazy
201785b674
Fix cell count in centrifuge. Closes #1856
2019-11-04 17:54:31 +03:00
drcrazy
7d17823b55
Bump dependencies
2019-11-01 16:47:23 +03:00
modmuss50
68c5e1637d
Revert "Fix #1854 "
...
This reverts commit 5338898a
2019-10-30 15:35:09 +00:00
modmuss50
9314899b08
Fix #1873
2019-10-28 21:10:12 +00:00
modmuss50
44b9c2ef05
Fix #1868
2019-10-28 20:37:53 +00:00
modmuss50
5338898ae3
Fix #1854
2019-10-28 16:04:29 +00:00
modmuss50
39861db8b5
Fix #1874
2019-10-28 15:59:29 +00:00
modmuss50
31962e9bf2
Fix #1872
2019-10-28 15:53:39 +00:00
modmuss50
c90e6389a8
Fix #1867
2019-10-26 21:59:55 +01:00
modmuss50
4564be7b49
Fix #1869
2019-10-26 21:56:07 +01:00
modmuss50
b42ecbc070
Tweak cable logic, should fix #1858
2019-10-26 21:54:25 +01:00
modmuss50
ef96e41557
Fix #1844
2019-10-18 20:26:30 +01:00
modmuss50
4bbcf9e282
Fix #1860
2019-10-18 20:02:50 +01:00
modmuss50
371c1fe21b
Fix #1859
2019-10-18 19:52:21 +01:00
modmuss50
6151757914
Fix #1857
2019-10-18 19:47:45 +01:00
Meredith Espinosa
3629276e87
Fix tweaker_test.js.mcmeta ( #1855 )
2019-10-15 22:07:05 +01:00
Meredith Espinosa
57c5ae13f1
Fix a couple typos in the sample script ( #1853 )
...
- add semicolons after print lines
- fix item stack creation in wire mill sample
- remove other rolling machine recipe I had for testing
2019-10-11 21:44:26 +01:00
Meredith Espinosa
989e4601af
Add LibCD Support ( #1851 )
...
* First ugly commit for LibCD support
* fix all the ugly hacks, add rolling machine + fluid gen recipes
* be a bit more lenient with fluid generator names
* add test script, fix a few bugs
* get rid of ShapedRecipeSerializer stuff that's no longer needed
* Add a warning to the sample script
2019-10-11 21:30:26 +01:00
modmuss50
bfce163c99
Fix #1852
2019-10-11 16:26:48 +01:00
modmuss50
643436d129
Cleanup RollingMachineRecipe syncing, should aid with #1851
2019-10-11 16:18:10 +01:00
drcrazy
264224a6f9
Stripped version of Rubber Log.
2019-10-08 13:03:01 +03:00
drcrazy
e72edd5eec
New textures for several machines.
2019-10-05 13:20:35 +03:00
drcrazy
ad2d0f6644
UU Matter face lift. Kudos to Spearkiller
2019-10-05 13:13:31 +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
drcrazy
f4e29cf9cb
Warnings and Updated textures
2019-09-24 13:35:26 +03:00
modmuss50
b70a938796
Cables can now pull energy out of other mods blocks.
2019-09-22 14:17:46 +01:00
modmuss50
7f4fb6d80b
Cleanup
2019-09-22 13:01:34 +01:00
modmuss50
5142f84a3e
Fix charging and discharging items in Energy Storage blocks.
2019-09-22 12:27:45 +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
modmuss50
5001331577
Fix generator's active state being incorrect in some situations
2019-09-21 11:24:40 +01:00
modmuss50
c401a336bc
Fix #1827
2019-09-20 17:01:37 +01:00
drcrazy
dc1b953a24
Use lithium cell for Li-ion battery. Closes #1840
2019-09-19 11:22:25 +03:00
modmuss50
c4660308bf
Merge branch '1.14' of https://github.com/TechReborn/TechReborn into 1.14.4
2019-09-16 23:12:02 +01:00
modmuss50
a4a578917d
Update energy api
2019-09-16 23:11:56 +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
fb4459c218
More tags fixes #1843
2019-09-15 15:48:35 +01:00
modmuss50
7873670a4f
Remove some duplicate code
2019-09-15 14:09:20 +01:00
modmuss50
2f9b154e22
Move to RC's fluid instance, closes #1826
2019-09-15 13:59:46 +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
modmuss50
0b39eb9863
Fixes #1836
2019-09-10 14:21:23 +01:00
modmuss50
4f80a8c651
start on new power api
2019-09-10 14:09:15 +01:00
drcrazy
9075f320d4
Refactoring for rubber blocks
2019-09-09 14:49:47 +03:00
drcrazy
e4cb66768e
Helper for rubber stuff
2019-09-09 14:46:53 +03:00
drcrazy
de917a64bc
New textures for nuggets, plates and small dusts.
2019-09-04 11:32:15 +03:00
drcrazy
b22cc3a827
New textures for dusts, ingots and gems
2019-09-03 20:28:13 +03:00
drcrazy
8cff7c1644
New textures for storage blocks
2019-09-03 20:09:34 +03:00
drcrazy
aab010af3c
Updated textures for rubber planks, door, trapdoor
2019-09-02 16:23:03 +03:00
modmuss50
ea23ef7038
cleaup method name
2019-08-30 19:26:37 +01:00
modmuss50
0724c2017a
Cleanup / minor improvements to the chunk loader.
2019-08-30 18:12:17 +01:00
modmuss50
3f4e53e259
Made the chunkloader work
2019-08-30 17:53:46 +01:00
drcrazy
adebb34a03
Charge\discharge items on server side only. Should fix #1822
2019-08-30 15:15:47 +03:00
drcrazy
7c4564b5ab
Move common code for iron machines into abstract class
2019-08-30 14:26:23 +03:00
drcrazy
fbfa24b6ff
Iron furnace accumulates and drops experience. Closes #1817
2019-08-29 02:43:39 +03:00
drcrazy
528b868abe
Do not forget to call super in GUI init
2019-08-28 17:56:59 +03:00
drcrazy
2518c32c54
UpDown button refactoring
2019-08-28 15:40:42 +03:00
drcrazy
0d68f794ae
Iron furnace drops experience. Still need to save fuel time to tag
2019-08-28 02:46:56 +03:00
modmuss50
4a5fe76323
19w34a
2019-08-27 23:58:42 +01:00
drcrazy
09b59d6c87
Initial work on experience from smelting for #1817
2019-08-27 01:52:52 +03:00
drcrazy
6ceb6e69cf
Further refactoring of Iron machines
2019-08-26 23:31:56 +03:00
modmuss50
a19c25a504
Fixes #1812
2019-08-26 20:11:55 +01:00
modmuss50
aa5d81dbe8
Fix the nano saber might needs its numbers tweaked. Closes #1816
2019-08-26 20:00:59 +01:00
drcrazy
026dedd2e6
Refactoring for Iron Furnace
2019-08-26 19:03:01 +03:00
drcrazy
2cd8183c12
Facelift for chunkloader. Closes #1806
2019-08-24 01:41:40 +03:00
drcrazy
ceaa2cc3ca
Buffed cells recipe
2019-08-24 00:18:15 +03:00
drcrazy
66e8652c87
REI support for two new machines
2019-08-23 14:12:31 +03:00
drcrazy
5cf7bc9107
Fix null slotconfig for IndustrialGrinder. Closes #1810
2019-08-23 12:25:53 +03:00
drcrazy
f3cdd131a0
Show fluids in REI. Why water is so weird?
2019-08-23 01:40:14 +03:00
drcrazy
9f22ddf686
Outline won't match cable model exactly. Closes #1804
2019-08-22 14:54:48 +03:00
drcrazy
7d4c88cbd5
Fix electrolyzer recipes. Closes #1805
2019-08-22 03:14:46 +03:00
drcrazy
a8eb6f67c0
Properly check for recipe inputs. Closes #1803
2019-08-22 02:45:26 +03:00
drcrazy
154dff4cbf
Unused imports + warnings )
2019-08-22 01:23:32 +03:00
modmuss50
49b42752a1
Fix some server crashes
2019-08-21 19:39:10 +01:00
drcrazy
8d8bb88942
Rubber Wood door for #1739
2019-08-21 14:06:03 +03:00
drcrazy
7e5ba45eb4
Rubber Wood Pressure plate for #1739
2019-08-21 13:45:35 +03:00
drcrazy
2f30d848af
Rubber Wood button for #1739
2019-08-21 02:03:58 +03:00
drcrazy
1b500e6e65
More JSONs for rubber stuff
2019-08-21 01:26:17 +03:00
drcrazy
f38b87996a
Rubber fence and fence gate. Some work on #1739
2019-08-20 23:59:18 +03:00
modmuss50
7defc53242
Start on json based machine tile + guis
2019-08-20 17:40:31 +01:00
modmuss50
92b3bc6651
Possible solution for #1798
2019-08-20 16:44:25 +01:00
modmuss50
6114f45d9b
Cleanup + remove some TODO's that dont apply anymore
2019-08-20 15:15:26 +01:00
modmuss50
6174506d6c
Fix #1802
2019-08-20 15:06:09 +01:00
modmuss50
17665e7400
Merge remote-tracking branch 'origin/1.14' into 1.14.4
2019-08-20 14:36:55 +01:00
modmuss50
e437838c12
Fix small issue with blast furnace
2019-08-20 14:36:46 +01:00
drcrazy
fee7d69919
Add heat to REI
2019-08-20 03:44:54 +03:00
drcrazy
21d77a2d7d
Lava now works for blast furnace. Closes #1800
2019-08-20 02:52:16 +03:00
drcrazy
5bac19e302
tags for rolling machine + some REI polishing
2019-08-20 00:01:38 +03:00
drcrazy
f682142ef7
Fix biofuel model
2019-08-19 23:23:07 +03:00
modmuss50
33556c8262
Fix #1796
2019-08-19 20:23:32 +01:00
modmuss50
a30e86b4cb
Minor cleanup
2019-08-19 20:09:07 +01:00
modmuss50
e4c9005e23
Add recipes for the 2 new machines
2019-08-19 20:04:12 +01:00
modmuss50
20517d4c32
Wire Mill
2019-08-19 19:51:05 +01:00
modmuss50
066d1bc9e2
Remove all awt usage
2019-08-19 14:40:02 +01:00
Daniel She
f0b8d99853
Update to REI 3.0-pre ( #1793 )
...
* Update to REI 3.0-pre
* Update fabric.mod.json
2019-08-19 14:26:47 +01:00
modmuss50
c03d99f11f
Fix #1797 recipe.fits is client only for some reason :D
2019-08-19 14:26:25 +01:00
modmuss50
456afac70a
Texture updates
2019-08-19 14:07:58 +01:00
modmuss50
740a0ddecc
EV Transformer
2019-08-19 13:58:35 +01:00
modmuss50
5511b598d7
Solid Canning Machine
2019-08-19 13:52:42 +01:00
modmuss50
2d34ebc480
Biofuel
2019-08-19 13:30:15 +01:00
modmuss50
aab3a02184
cleanup config field names
2019-08-18 17:09:10 +01:00
modmuss50
2d64004171
Fix superconductors overflowing
2019-08-18 15:59:58 +01:00
modmuss50
0bcf782f57
Fix AESU and Fusion control buttons
2019-08-18 15:54:25 +01:00
modmuss50
7f8bd2ab1f
Fix electric furnace not always turning off
2019-08-18 15:31:21 +01:00
modmuss50
926063ffcf
Fix manual gui. Closes #1792
2019-08-18 15:23:24 +01:00
modmuss50
64b3441d6d
Fix Electric Furnace not checking if there is room for the outputs
2019-08-18 15:13:49 +01:00
modmuss50
f53d65ca48
Fixes #1785
2019-08-18 14:36:06 +01:00
modmuss50
bfb8d81367
Fix ingredients not always using the correct amount of items
2019-08-18 14:30:59 +01:00
modmuss50
d585b298fb
Fix some issues with the fluid handling of items
2019-08-18 14:22:45 +01:00
drcrazy
3eec5bcb5b
Added some recipe texts to REI. Looks ugly
2019-08-16 14:18:48 +03:00
drcrazy
3e5965ad57
Fix progress bar for electric furnace
2019-08-15 21:14:42 +03:00