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
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
drcrazy
a2bb34ead0
Fluid Replicator recipes done. Need rei support for fluid
2019-08-07 14:19:09 +03:00
drcrazy
ed5c2cc870
Removed unused imports
2019-08-07 13:10:02 +03:00
modmuss50
64323a061b
Remove test recipes
2019-08-07 00:27:13 +01:00
modmuss50
e4136f547d
Fix version not being set in the mod.json + some clean up
2019-08-06 23:42:25 +01:00
modmuss50
4cc8ab9d68
more recipes
2019-08-06 21:12:56 +01:00
modmuss50
83483ce8d3
Fluid replicator
2019-08-06 20:56:52 +01:00
modmuss50
4645c365c2
Fix bad commit
2019-08-06 20:41:06 +01:00
modmuss50
1cc1b25aee
remove configured access, make it the default on all inv's
2019-08-06 20:33:46 +01:00
modmuss50
c60a279876
Rubber tree fixes and fixes to the solid fuel generator
2019-08-06 20:29:05 +01:00
drcrazy
5bbb48b3e2
Fixed ore drops
2019-08-06 14:44:49 +03:00
drcrazy
ab0293c7e9
Fluid Replicator recipes are not working ))
2019-08-05 17:05:59 +03:00
drcrazy
03bebee309
Industrial Grinder recipes done
2019-08-05 15:03:00 +03:00
drcrazy
c29ab8ecea
More Industrial Grinder recipes
2019-08-05 11:50:38 +03:00
modmuss50
536de89742
Refactor tank recipes
2019-08-04 18:59:02 +01:00
drcrazy
ea91d852af
Fix industrial grinder from crashing
2019-08-04 19:07:10 +03:00
drcrazy
61e683acc2
More electrolyzer recipes and some beauty for REI
2019-08-04 03:09:49 +03:00
drcrazy
b59712bfb4
Start of industrial electrolyzer recipes
2019-08-03 14:09:57 +03:00
modmuss50
2715eae180
Merge remote-tracking branch 'origin/1.14' into 1.14.4
2019-08-02 14:08:11 +01:00
modmuss50
5b6895c47d
tag -> nbt
2019-08-02 14:08:04 +01:00
drcrazy
cae663cc6c
More icons in REI
2019-08-02 15:04:03 +03:00
drcrazy
8c0a3b3197
Review of Industrial centrifuge recipes
2019-08-02 11:26:38 +03:00
drcrazy
4c8581ad49
Grinder recipes review
2019-08-02 02:32:34 +03:00
drcrazy
906999f4b4
Compressor recipes reviewed. Couple are missing
2019-08-02 00:33:21 +03:00
drcrazy
0dd2f078ba
Fix build and recipe
2019-08-01 21:05:42 +03:00
drcrazy
40755131a4
Even more blocks removed
2019-08-01 20:30:28 +03:00
drcrazy
901a4c106a
Separate blocks for Tier1 machines gone
2019-08-01 17:45:59 +03:00
drcrazy
0d9ddc03de
Start of machine blocks generalization
2019-08-01 16:33:35 +03:00
drcrazy
255f277304
Should fix armor rendering
2019-08-01 14:34:43 +03:00
Prospector
9eca97e428
Merge remote-tracking branch 'origin/1.14' into 1.14
2019-07-31 21:39:13 -07:00
Prospector
8221be0800
Match sizing to cells
2019-07-31 21:38:47 -07:00
drcrazy
d53779f2c9
Light cleanup
2019-08-01 03:38:55 +03:00
drcrazy
e7adce612e
Make TR armor repairable
2019-08-01 03:22:14 +03:00
Prospector
78cbf9a2ac
Dynamic bucket textures
2019-07-31 16:13:03 -07:00
modmuss50
779dea4bf8
Enable the buckets again
2019-07-31 20:57:18 +01:00
modmuss50
858adafead
Small tweaks + cleanup
2019-07-31 20:50:17 +01:00
modmuss50
70279c1800
More fluid work
2019-07-31 19:37:17 +01:00
modmuss50
739f4c21e8
Fix multiplayer crashes
2019-07-31 17:34:53 +01:00
drcrazy
398d74dedc
Implosion Compressor recipes
2019-07-31 17:24:36 +03:00
drcrazy
66a6577dde
Inject TR loot into chests
2019-07-31 16:17:59 +03:00
Prospector
35c6c12b72
Remove unnecessary atlas-adding
2019-07-31 00:09:28 -07:00
Prospector
711c95c58e
Merge remote-tracking branch 'origin/1.14' into 1.14
2019-07-30 23:35:02 -07:00
Prospector
78b72795c6
Fix cell rendering (blessed Grondag for helping immensely)
2019-07-30 23:34:51 -07:00
drcrazy
5406d08f5d
Cleanup and warnings
2019-07-31 02:41:54 +03:00
drcrazy
d1178df673
Ore drop is not working (cry)
2019-07-31 02:13:53 +03:00
Prospector
07db922127
Merge remote-tracking branch 'origin/1.14' into 1.14
2019-07-30 15:26:22 -07:00
Prospector
51ed95008f
Add more metadata
2019-07-30 15:26:09 -07:00
modmuss50
a1674cb8a8
More recipes ported
2019-07-30 21:16:44 +01:00
modmuss50
3c29c06d39
Merge remote-tracking branch 'origin/1.14' into 1.14.4
2019-07-30 20:02:57 +01:00
modmuss50
9c9c5f7ac9
A few more recipes
2019-07-30 20:02:40 +01:00
drcrazy
14a78baf5b
Initial pass on loot tables for blocks.
2019-07-30 17:13:31 +03:00
modmuss50
dd7ca7dc99
more recipes
2019-07-30 13:05:25 +01:00
modmuss50
9a92325da3
add the mess of the recipe generator code
2019-07-30 12:13:17 +01:00
modmuss50
7e2bf482a2
sawmill recipes
2019-07-30 12:12:56 +01:00
modmuss50
6fc7b7096a
auto generated some compressor and grinder recipes
2019-07-30 11:58:07 +01:00
modmuss50
b5d5ef2ca0
Some more recipes
2019-07-30 01:58:41 +01:00
modmuss50
6c0f8afa68
Some grinder recipes
2019-07-30 00:29:50 +01:00
drcrazy
aa7464ad4a
Moved recipe utility methods to RecipeUtils
2019-07-30 01:46:12 +03:00
drcrazy
878734e4ad
Blast furnace recipes moved to 1.14
2019-07-29 21:24:47 +03:00
modmuss50
aafc42784a
Fix Industrial Drill
2019-07-29 16:14:17 +01:00
modmuss50
2308ed0f05
Fix power durability display
2019-07-29 16:02:14 +01:00
modmuss50
5e19889c96
Some hologram changes, the button wont work.
2019-07-29 15:22:48 +01:00
drcrazy
13ed4d1c22
Typo and license
2019-07-29 17:18:52 +03:00
drcrazy
661698593e
Some blast furnace recipes
2019-07-29 17:14:34 +03:00
modmuss50
e4c2f1be6d
Fix alarm culling and bounding boxes
2019-07-29 14:39:01 +01:00
modmuss50
09662db11a
Merge remote-tracking branch 'origin/1.14' into 1.14.4
2019-07-29 14:31:42 +01:00
modmuss50
27207cb498
Expand fluid ingredient to allow limiting to specific fluid holder types
2019-07-29 14:31:21 +01:00
drcrazy
c4a3e5ecf5
Failed attempt to make cell recipe in reactor
2019-07-29 11:25:44 +03:00
drcrazy
213c1b6faa
Some chemical reactor recipes
2019-07-29 11:09:37 +03:00
drcrazy
3b63383012
More on REI
2019-07-29 02:16:43 +03:00
drcrazy
29aeb50d85
Translation for REI recipe categories
2019-07-28 23:39:01 +03:00
modmuss50
b89a52e594
Fluid color in cell changes color based on biome's water color + some other fixes and changes
2019-07-28 17:29:01 +01:00
modmuss50
0da3168bbf
Fluid ingredients + some other work around this area
2019-07-28 17:14:38 +01:00
modmuss50
0118d5a999
Refactor machine ingredients
2019-07-28 14:50:06 +01:00
drcrazy
a7de6b428a
Cleanups
2019-07-27 01:52:51 +03:00
drcrazy
4e1dfa0018
Translation for solar panels
2019-07-26 15:22:48 +03:00
drcrazy
d76d637781
Fix solar panel loading NPE
2019-07-26 15:12:47 +03:00
drcrazy
f28462a9e6
Alloy smelter recipes
2019-07-26 14:08:03 +03:00
drcrazy
e4b0eff608
Blockstates and models for fluid blocks
2019-07-26 12:41:10 +03:00
drcrazy
f06e1a8673
ModSounds refactored to follow items, blocks and fluids
2019-07-26 11:45:30 +03:00
drcrazy
316def3086
Cables are working
2019-07-26 02:37:02 +03:00
drcrazy
cc91888c4a
More alloys
2019-07-25 15:59:43 +03:00
drcrazy
80f2440323
Unused imports and Lightning rod
2019-07-25 15:20:57 +03:00
modmuss50
52da17dfd5
Start on REI support, very basic right now, but it will help a lot when adding recipes.
2019-07-25 13:14:46 +01:00
modmuss50
a80d2183f9
Fix iron furnace
2019-07-25 00:16:49 +01:00
modmuss50
fc56eeaf61
Slot config
2019-07-25 00:10:11 +01:00
modmuss50
6a93c3fd46
more misc fluid work, gonna leave most of this untill we have an offical or new api
2019-07-24 19:06:21 +01:00
drcrazy
0742abb840
Start of alloy smelter recipes
2019-07-24 16:33:17 +03:00
drcrazy
ba7372c940
Couple of blockstates for fluids
2019-07-24 15:43:57 +03:00
drcrazy
c0164302e9
Smelting recipes done.
2019-07-24 13:01:45 +03:00
modmuss50
8964c5aceb
Basic Dynamic cell rendering
2019-07-24 01:37:05 +01:00
modmuss50
fb2a5a15b9
Fix fluid rendering and physics
2019-07-23 23:33:51 +01:00
modmuss50
9b46e3237e
move to silk fluids
2019-07-23 21:30:57 +01:00
modmuss50
85554bcfe2
Some more fixes to fluids
2019-07-23 21:09:10 +01:00
modmuss50
83bf6add1e
Large amount of fluid work
2019-07-23 20:46:07 +01:00
modmuss50
1e52477b9e
small fixes
2019-07-23 17:51:38 +01:00
drcrazy
56503ad117
Start of melting recipes
2019-07-23 17:21:17 +03:00
drcrazy
eb6a8b9ceb
Done with crafting table recipes. New items don't have them yet.
2019-07-23 17:04:55 +03:00
drcrazy
4ec41d0bdc
Recipe for dust from small dusts
2019-07-23 14:59:45 +03:00
drcrazy
54ad3360fd
Moar storage recipes
2019-07-23 01:50:01 +03:00
drcrazy
f1ddc86bdd
Reorder crafting table recipes
2019-07-23 01:20:04 +03:00
drcrazy
3aa40608f7
Added storage block from ingots recipe + subfodlers
2019-07-22 18:24:03 +03:00
drcrazy
9ec95d7147
uu-matter got some buffs during move to json
2019-07-22 17:26:58 +03:00
modmuss50
dbc89adaf7
Tile -> BlockEntity + some more refactors
2019-07-22 12:45:13 +01:00
modmuss50
7f8674f1ca
fix syncID issues, should fix a lot of issues with the inv handing.
2019-07-22 11:54:13 +01:00
modmuss50
50c13bafdc
1.14.4
2019-07-22 11:31:24 +01:00
drcrazy
d0dedc6893
Cleanup
2019-07-22 02:43:22 +03:00
drcrazy
1639fd63a3
Remove excessive modifiers
2019-07-22 01:27:30 +03:00
drcrazy
70d6c8f102
Of the final day
2019-07-19 11:57:18 +03:00
drcrazy
f890ac7146
And leave behind those who don't know
2019-07-19 01:12:48 +03:00
drcrazy
ed6cfa916b
Above us all
2019-07-18 16:24:29 +03:00
drcrazy
7d05bfbe96
Machines we are sending to the skies
2019-07-18 16:24:11 +03:00
drcrazy
7977a8e73b
Few warnings and moar recipes
2019-07-18 01:32:37 +03:00
drcrazy
9ac21ded30
Fix lang and parts
2019-07-18 00:49:07 +03:00
drcrazy
db9db5b77d
More tool recipes
2019-07-17 17:17:15 +03:00
drcrazy
d9cbbfa0fc
Gem armor and tools
2019-07-17 16:24:37 +03:00
drcrazy
9db0e068e1
Recipe for cables
2019-07-16 23:06:32 +03:00
drcrazy
8b37482494
Just a few recipes
2019-07-16 13:58:29 +03:00
drcrazy
3edff88ee0
Ores and Rubber trees are spawn on Overworld and Nether
2019-07-16 02:25:07 +03:00
drcrazy
7e4d65ffa0
Tags for rubber stuff
2019-07-16 01:17:29 +03:00
drcrazy
c2e871a31b
They grow. But not sustain yet (
2019-07-15 23:30:10 +03:00
drcrazy
d6788c8da5
Moved misc blocks to their own package. Start of rubber stuff
2019-07-15 17:24:31 +03:00
drcrazy
4f1593771e
Fixed imports
2019-07-15 10:59:08 +03:00
drcrazy
5d93843a1e
Formatting
2019-07-15 10:43:08 +03:00
drcrazy
57d0d6d3f0
Improvements for BlockCable
2019-07-15 02:44:27 +03:00
drcrazy
3e7596bbdb
Fixed last texture error re forge bucket png is missing
2019-07-13 02:50:59 +03:00
drcrazy
ce72496ddd
Models for cables
2019-07-12 17:22:22 +03:00
modmuss50
d6e64364fc
Power fixes
2019-07-10 22:34:55 +01:00
modmuss50
e26d1edc52
Configs
2019-07-10 21:56:22 +01:00
modmuss50
a7fbc3017b
more inv fixes
2019-07-04 12:16:17 +01:00
modmuss50
42637df12d
Fix nuke
2019-07-01 00:48:20 +01:00
modmuss50
7dc6dddc51
Refactor out inv wrapper
2019-07-01 00:39:13 +01:00
modmuss50
18950e0b29
1.14.3 + more recipe fixes
2019-07-01 00:24:12 +01:00
modmuss50
5f134a7379
Fixes
2019-06-30 22:56:56 +01:00
modmuss50
f8f20ce6ba
1.14.2
2019-06-13 13:14:11 +01:00
modmuss50
4479116d1c
Add a tooltip event to fix the tooltips
2019-06-12 22:27:09 +01:00
modmuss50
8d859bd77b
fix some crashes
2019-06-12 20:01:44 +01:00
modmuss50
07a5c322e3
it runs
2019-06-12 19:57:23 +01:00
modmuss50
6b9f6cb4f8
it compiles :D
2019-06-12 19:29:04 +01:00
modmuss50
500ff29dbd
377
2019-06-04 12:13:15 +01:00
modmuss50
d18d1b820e
397
2019-06-04 12:05:18 +01:00
modmuss50
e8396dbc33
831, doesnt seem impossible
2019-05-27 22:21:58 +01:00
modmuss50
4e03ac893c
1147 - Initial auto mappings pass
2019-05-26 12:37:59 +01:00
drcrazy
48198dbcb3
Models for lamps
2019-05-02 11:31:07 +03:00
drcrazy
2794c813eb
Fix alarm shape
2019-05-01 00:40:14 +03:00
drcrazy
e01e9398ea
Model for alarm
2019-04-30 16:48:43 +03:00
drcrazy
b9ae05afaa
IDSU and LESU got models
2019-04-30 13:11:00 +03:00
drcrazy
6c8d9e9b74
Superconductor cable port from 1.12 to 1.13
2019-04-29 17:42:29 +03:00
modmuss50
6ab23c4c64
Merge remote-tracking branch 'remotes/origin/1.12' into 1.13
...
# Conflicts:
# build.gradle
# src/main/java/techreborn/Core.java
# src/main/java/techreborn/api/fluidreplicator/FluidReplicatorRecipe.java
# src/main/java/techreborn/api/recipe/recipes/BlastFurnaceRecipe.java
# src/main/java/techreborn/blocks/BlockMachineCasing.java
# src/main/java/techreborn/blocks/cable/EnumCableType.java
# src/main/java/techreborn/blocks/generator/solarpanel/BlockSolarPanel.java
# src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java
# src/main/java/techreborn/blocks/transformers/BlockTransformer.java
# src/main/java/techreborn/client/gui/GuiAESU.java
# src/main/java/techreborn/client/gui/GuiManual.java
# src/main/java/techreborn/client/gui/GuiVacuumFreezer.java
# src/main/java/techreborn/command/TechRebornDevCommand.java
# src/main/java/techreborn/compat/jei/RecipeUtil.java
# src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java
# src/main/java/techreborn/compat/jei/fusionReactor/FusionReactorRecipeWrapper.java
# src/main/java/techreborn/compat/jei/industrialSawmill/IndustrialSawmillRecipeWrapper.java
# src/main/java/techreborn/config/ConfigTechReborn.java
# src/main/java/techreborn/init/IC2Duplicates.java
# src/main/java/techreborn/init/ModRecipes.java
# src/main/java/techreborn/init/OreDict.java
# src/main/java/techreborn/init/recipes/CraftingTableRecipes.java
# src/main/java/techreborn/init/recipes/FusionReactorRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialCentrifugeRecipes.java
# src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java
# src/main/java/techreborn/init/recipes/SmeltingRecipes.java
# src/main/java/techreborn/items/ItemUpgrades.java
# src/main/java/techreborn/items/ingredients/ItemParts.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java
# src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java
# src/main/java/techreborn/items/tools/ItemWrench.java
# src/main/java/techreborn/tiles/TileAlarm.java
# src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java
# src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java
# src/main/java/techreborn/tiles/generator/TileLightningRod.java
# src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java
# src/main/java/techreborn/tiles/machine/multiblock/TileVacuumFreezer.java
# src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java
# src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java
# src/main/java/techreborn/tiles/machine/tier1/TileRollingMachine.java
# src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java
# src/main/java/techreborn/tiles/storage/TileAdjustableSU.java
# src/main/java/techreborn/world/TechRebornRetroGen.java
# src/main/resources/assets/techreborn/blockstates/items/materials/part.json
# src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json
2019-04-27 20:32:56 +01:00
drcrazy
77fa583360
More models for energy storages
2019-04-26 17:59:37 +03:00
drcrazy
5c309c8b3d
Updated forge to 1.13.2 - 25.0.191. Removed unused imports
2019-04-26 17:37:10 +03:00
drcrazy
8cc611192d
Lapotron Crystal dedupe for #1665
2019-04-25 16:40:36 +03:00
drcrazy
d30d3316e9
Energy Crystal dedupe for #1665
2019-04-25 16:07:06 +03:00
drcrazy
2afa32ad9e
Models for some energy storages
2019-04-24 17:36:09 +03:00
drcrazy
86a2056903
Models for transformers. Optimus Prime FTW!
2019-04-24 17:19:15 +03:00
drcrazy
138c5e6072
De-dupe for re-battery. Some work on #1665
2019-04-23 20:57:56 +03:00
drcrazy
a506f4b301
Updated rubber log usage. Some work on #1706
2019-04-23 16:14:54 +03:00
drcrazy
a9acc91eff
Models for generators done
2019-04-22 18:58:02 +03:00
drcrazy
a1fc56042a
Models for generators
2019-04-22 17:38:17 +03:00
modmuss50
9f39da44b1
things craft
2019-04-15 21:54:55 +01:00
modmuss50
d45284de2c
Add a wrapper around Ingredient to allow for stack sizes
2019-04-15 20:46:25 +01:00
modmuss50
1dad4697ba
Start moving everything over to the new system
2019-04-14 17:01:38 +01:00
modmuss50
98dd01697c
Basic test of a grinder recipe
2019-04-14 16:17:26 +01:00
drcrazy
c57c8b5287
Filter compressor and extractor recipes from JEI if IC2 dedupe is true
2019-04-12 12:45:34 +03:00
drcrazy
dde849e19a
More debug info
2019-04-09 18:04:03 +03:00
drcrazy
f906aaa3cd
Fix sap side
2019-04-09 17:04:51 +03:00
drcrazy
2a180cb5c2
Commented out tank update()
2019-04-09 16:34:54 +03:00
drcrazy
cd48daa152
Tier3 machine models done.
2019-04-09 15:04:05 +03:00
drcrazy
04f4e51695
Models for tier2 machines done.
2019-04-09 12:45:29 +03:00
drcrazy
76c2c03a13
More models for tier2 machines
2019-04-08 16:59:06 +03:00
drcrazy
3892b15685
More models for tier2 machines
2019-04-05 16:19:39 +03:00
drcrazy
6fecbb9392
Solar panels got models
2019-04-05 13:19:01 +03:00
drcrazy
4df9d62a90
More models
2019-04-04 17:29:03 +03:00
modmuss50
75f06f6f80
Make creative solar panel quicker
2019-04-03 22:31:16 +01:00
modmuss50
afe6a179af
Optimise matter fab a bit
2019-04-03 22:09:44 +01:00
modmuss50
925a7b4c0a
Add tank support for Fluid Replicator, fixes https://github.com/TechReborn/TechReborn/issues/1698
2019-04-03 21:48:44 +01:00
drcrazy
ec2fcf5d6d
Removed unused import.
2019-04-03 18:24:27 +03:00
drcrazy
b713b43eaf
Transformers\Energy storages will use vanilla rotation. Closes #1692
2019-04-03 18:23:28 +03:00
drcrazy
c122a480e5
Updated forge and mappings
2019-04-01 17:22:59 +03:00
drcrazy
67c9c8721e
Changes in GUI for Freezer multiblock. Closes #1672
2019-04-01 15:57:08 +03:00
drcrazy
74d1837167
Updated freezer multiblock. More work on #1672
2019-04-01 15:27:58 +03:00
drcrazy
080e305efe
Models for iron machines
2019-03-29 17:03:10 +03:00
drcrazy
c45e7fb836
Tier1 machines got models
2019-03-29 14:41:08 +03:00
drcrazy
5a910c94af
Model for alloy smelter
2019-03-28 18:09:48 +03:00
drcrazy
16ff7af929
Updated vacuum freezer multiblock. Some work for #1672
2019-03-28 18:09:25 +03:00
drcrazy
84a380f51e
Frames&Casings
2019-03-27 14:49:09 +03:00
drcrazy
0feec0612c
Done with models for items. Except cell (
2019-03-27 03:49:30 +03:00
drcrazy
f9c484090f
Model for lithium batpack
2019-03-26 22:22:24 +03:00
drcrazy
79af5c0a15
Models for batteries
2019-03-26 21:07:34 +03:00
drcrazy
d3c6d43fee
Tags for rubber stuff
2019-03-26 18:10:18 +03:00
drcrazy
5353b9c773
Upgrades got models
2019-03-26 15:29:38 +03:00
drcrazy
01103a26ba
Check blast furnace upgrades both on client and server. Closes #1694
2019-03-26 14:28:59 +03:00