maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4658 commits 1 branch 0 tags 80 MiB
Commit graph

3953 commits

Author SHA1 Message Date
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