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 |
|
drcrazy
|
9035e4376a
|
Fix for #1782, cheap basic tools and fixed some warnings here and there
|
2019-08-14 17:15:34 +03:00 |
|
drcrazy
|
dc8511f1f0
|
Fix armor textures
|
2019-08-14 14:04:49 +03:00 |
|
drcrazy
|
b0576e3aba
|
Charge powered items from chest armor
|
2019-08-13 21:20:41 +03:00 |
|
drcrazy
|
6282e1f714
|
Filter fluids input for fluid generators.
|
2019-08-13 21:00:28 +03:00 |
|
drcrazy
|
8f94d3484b
|
Should fix Plasma Generator for #1780
|
2019-08-13 19:43:36 +03:00 |
|
drcrazy
|
0fa30e2381
|
Rename armor texture
|
2019-08-13 18:33:42 +03:00 |
|
modmuss50
|
442dfde50f
|
Add some hardness to more blocks, Fixes #1779
|
2019-08-13 16:28:21 +01:00 |
|
modmuss50
|
eca7aaa34f
|
add a Towelette plugin to blacklist our fluids, fixes the game not loading
|
2019-08-13 16:24:24 +01:00 |
|
modmuss50
|
75d9bccd6a
|
Merge branch '1.14' of https://github.com/TechReborn/TechReborn into 1.14.4
|
2019-08-13 15:53:56 +01:00 |
|
modmuss50
|
35bb2df90e
|
First pass on ISDU rewrite, uses RC's new DataAttachment system
|
2019-08-13 15:53:50 +01:00 |
|
drcrazy
|
f9023d7b0f
|
Itemgroup filler moved to init utils.
|
2019-08-13 17:02:34 +03:00 |
|
drcrazy
|
62f1c521f0
|
Jackhammer should work
|
2019-08-13 15:04:19 +03:00 |
|
drcrazy
|
2a6a91fa87
|
Make carbon mesh shapeless
|
2019-08-13 13:53:28 +03:00 |
|
drcrazy
|
54813ecdc3
|
Bumped modloader + recipes + lang for buckets
|
2019-08-13 13:51:44 +03:00 |
|
modmuss50
|
5e33977d6a
|
Add carbon mesh recipe, fixes #1777
|
2019-08-13 11:49:34 +01:00 |
|
modmuss50
|
ff8b497c54
|
Fix thermal generator
|
2019-08-13 11:45:25 +01:00 |
|
modmuss50
|
158d8acd21
|
Tags in recipes
Not a lot I could do about the reformat of jsons
|
2019-08-12 23:38:16 +01:00 |
|
modmuss50
|
b1545b3021
|
Tags, stage 1
|
2019-08-12 22:59:13 +01:00 |
|
modmuss50
|
11b2a3f68e
|
Update ore textures, closes #1768
|
2019-08-12 22:40:00 +01:00 |
|
modmuss50
|
edf4c3f287
|
Fixes #1758
|
2019-08-12 22:31:41 +01:00 |
|
modmuss50
|
832844b438
|
Merge branch '1.14' of https://github.com/TechReborn/TechReborn into 1.14.4
|
2019-08-12 22:29:02 +01:00 |
|
modmuss50
|
5c54358aa2
|
Cleanup
|
2019-08-12 22:28:53 +01:00 |
|
drcrazy
|
1f9bfabf21
|
Removed unused imports
|
2019-08-12 22:04:24 +03:00 |
|
modmuss50
|
3e1cf7d40a
|
Fix bad rename
|
2019-08-12 19:52:58 +01:00 |
|
modmuss50
|
77eee6f5b4
|
Move configs to one class
|
2019-08-12 17:57:00 +01:00 |
|
modmuss50
|
9db1978410
|
Finish porting all recipes to json, cleanup a lot of old code
|
2019-08-12 15:37:45 +01:00 |
|
modmuss50
|
2a5708b328
|
Rolling machine port/fixes
|
2019-08-12 15:05:49 +01:00 |
|
drcrazy
|
1dd83875ef
|
Add item tags. Closes #1767
|
2019-08-12 01:08:11 +03:00 |
|
drcrazy
|
207751996b
|
Fix crash with wrench. Closes #1771
|
2019-08-12 00:58:00 +03:00 |
|
drcrazy
|
56d1d196f0
|
Items use energy to do work. Closes #1770
|
2019-08-12 00:41:44 +03:00 |
|
drcrazy
|
4012a69fab
|
Fix Iron Furnace GUI
|
2019-08-11 23:56:43 +03:00 |
|
modmuss50
|
b975c302d8
|
Recipe time and power re-balance
|
2019-08-09 00:19:00 +01:00 |
|
modmuss50
|
6f35d5b527
|
remove euPerFU
|
2019-08-08 23:47:58 +01:00 |
|
modmuss50
|
9022746771
|
Add rubber planks to tag
|
2019-08-08 23:41:29 +01:00 |
|
modmuss50
|
2edffead05
|
update to use fabric api's offical event
|
2019-08-08 23:35:27 +01:00 |
|
modmuss50
|
a5bbb602f7
|
Dont crash with the rolling machine, wont work just yet.
|
2019-08-08 23:27:43 +01:00 |
|
modmuss50
|
2bda5c6ce4
|
Remove block drop overrides, it will come back later and use jsons or something :D
|
2019-08-08 23:25:10 +01:00 |
|
modmuss50
|
05d449faac
|
Fixes #1765
|
2019-08-08 23:17:53 +01:00 |
|
modmuss50
|
2ba06391f5
|
#betaBuild fix BE's not being loaded at the correct time
|
2019-08-08 21:18:48 +01:00 |
|
modmuss50
|
e0fb6042d8
|
Fix server crash #betaBuild
|
2019-08-08 14:27:21 +01:00 |
|
modmuss50
|
ac2e224afe
|
Make the machines louder so you can actually hear them. Fixes #1755
|
2019-08-08 13:45:02 +01:00 |
|
modmuss50
|
2415040add
|
Fix sawmill hologram offset. Closes #1750
|
2019-08-08 13:30:24 +01:00 |
|
modmuss50
|
981b9fa13b
|
Add endores back
|
2019-08-08 13:22:01 +01:00 |
|
modmuss50
|
74dd0f0be6
|
Fix electric tree tap recipe. Closes #1756
|
2019-08-08 12:33:09 +01:00 |
|
modmuss50
|
7217e84358
|
Scrapbox fixes and recipes. Closes #1752
|
2019-08-08 12:30:09 +01:00 |
|
modmuss50
|
a08ee3d17a
|
Fix manual crashing the game, closes #1754
|
2019-08-08 11:49:11 +01:00 |
|
modmuss50
|
02c823986a
|
Fix optifine crash, still some incompatibilities with shaders. Closes #1749
|
2019-08-08 11:33:12 +01:00 |
|
drcrazy
|
d80bf3a1ce
|
Update import to a proper one
|
2019-08-08 02:17:18 +03:00 |
|
drcrazy
|
ce56a1da31
|
Renamed some fluids to keep underscores so Prospector can read them.
|
2019-08-08 00:38:30 +03:00 |
|
modmuss50
|
fe2b600649
|
Fix iron fence not connecting
|
2019-08-07 21:20:33 +01:00 |
|
modmuss50
|
e8a77a1d75
|
Fix recycler slots not allowing items in it.
|
2019-08-07 20:54:44 +01:00 |
|
modmuss50
|
423f5ebab4
|
Cells can now pick up and place fluids
|
2019-08-07 20:52:59 +01:00 |
|
modmuss50
|
bca6d4157a
|
Remove rubber plantation loot table, its gone.
|
2019-08-07 20:28:31 +01:00 |
|
modmuss50
|
ab0b6bc2fa
|
Make obstinate happy
|
2019-08-07 20:24:13 +01:00 |
|
modmuss50
|
43c7a7fecf
|
Merge remote-tracking branch 'origin/1.14' into 1.14.4
|
2019-08-07 19:48:46 +01:00 |
|
modmuss50
|
009d18488d
|
Fixes #1747
|
2019-08-07 19:48:39 +01:00 |
|
Shnupbups
|
3af8a63f6c
|
Moved things from assets to data (#1745)
Moved advancements and the rubber plantation loot table to data, where they should be
|
2019-08-07 18:28:57 +01:00 |
|
drcrazy
|
6d4ea13284
|
Fusion Reactor recipe start
|
2019-08-07 18:17:39 +03:00 |
|