Commit graph

4433 commits

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