Commit graph

4402 commits

Author SHA1 Message Date
modmuss50
3752154bcd Add a simple tool to visualise ore distribution. 2021-11-26 20:01:08 +00:00
modmuss50
98bfb7b958 Deepslate ore gen improvements. 2021-11-17 23:19:38 +00:00
modmuss50
6f8282b188 Add deepslate ores 2021-11-17 22:40:02 +00:00
modmuss50
dd79effe80 Finish rubber trees. 2021-11-17 21:28:26 +00:00
modmuss50
e1093d782a First pass at world gen, rubber tree needs further work, ideally depends on fab api changes. 2021-11-16 23:54:31 +00:00
modmuss50
4a2e81550f Port to 1.18-pre2 without worldgen 2021-11-16 22:38:31 +00:00
KySoto
2fc6856826
Added deepslate variants of vanilla ores (#2600)
* Added deepslate variants of vanilla ores
* Update src/main/resources/data/c/tags/items/lapis_ores.json
Oof thanks for that catch
Co-authored-by: modmuss50 <modmuss50@gmail.com>
* Update coal_ores.json
forgot to add deepslate coal to the tag update
Co-authored-by: KySoto <kysoto2@gmail.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-11-11 10:30:15 +03:00
drcrazy
9dad64722c Fix potted rubber sapling name and drop. Closes #2596 2021-11-10 16:55:10 +03:00
modmuss50
a221d757aa Dont use fabric impl classes. 2021-11-06 12:32:17 +00:00
nalepamarcin
94ef6d1562
Fix missing hitbox of single block cable (#2593)
It prevented user from destroying last cable piece as it could not
be hit without being connected to other cable or a machine.

Bug was introduced in commit f39c619c "Fix cable shape computation".
2021-11-03 23:12:04 +01:00
Technici4n
7b4306a883
Fix #2569: make IDSU work properly with the new energy API (#2588) 2021-11-02 15:59:23 +01:00
Technici4n
b300456e77
Fix #2574: Use the fabric item API for auto input and auto output (#2585)
* Fix #2574: Use the fabric item API for auto input and auto output

* Only auto-insert at most 4 items at once
2021-10-31 18:14:26 +01:00
Technici4n
5a9d974eda Fix AE2 recipes: remove old charged certus, add deepslate certus support, fix dupe bugwhen grinding crystals 2021-10-22 18:40:31 +02:00
drcrazy
36203239e1 Cables with different transfer rate shouldn't connect. Closes #2572 2021-10-22 09:11:45 +03:00
Technici4n
165d27cfda
Set creative tank amount to capacity on tick. Fix #2558. Thanks to Technici4n
* Set creative tank amount to capacity on tick. Fix #2558.
* Remove FluidValue.INFINITE
* Was better with the /1000
2021-10-08 08:49:19 +03:00
Technici4n
f39c619c22
Fix cable shape computation. Closes #2435. Thanks to Technici4n
* Fix cable shape computation. Closes #2435.
* Remove unused import
2021-10-08 08:48:11 +03:00
Technici4n
99c46f0a56 Use new AE2 tag for certus quartz crystals 2021-10-03 23:06:56 +02:00
drcrazy
3c050b2105 Use exchangeStack method in fluid pickup. 2021-09-20 14:01:49 +03:00
Justin Vitale
f8c224ecf5 Add closing brackets to fusion reactor state text 2021-09-20 20:04:28 +10:00
drcrazy
4c4881e7e5 Cells should work on caludron. Closes #2490 2021-09-20 05:38:43 +03:00
Dave Smith
6b89b08ff0
Adds compressor recipe for empty cell -> compressed air cell (#2505) 2021-09-20 01:50:25 +03:00
Dave Smith
7d85960a4a
Fix 2509; reviewed all ticking entities to ensure consistency in checks (#2510) 2021-09-20 01:48:41 +03:00
drcrazy
42f0d5ce42 Smelt iron block to refined iron block. Closes #2487 2021-09-17 23:20:11 +03:00
drcrazy
5261d9f11f Bauxite should be mined with iron pickaxe. Closes #2489 2021-09-17 22:59:33 +03:00
drcrazy
69626d279b Sawdust got usage in recipes 2021-09-17 22:33:22 +03:00
Dave Smith
69be970d72
Removed unnecessary getFacingEnum method; super does all this stuff already and is more correct (#2502) 2021-09-17 18:28:29 +10:00
Technici4n
9fb725bdc5
Buff solar panels a bit (#2501)
* Buff solar panels

* First two tiers don't produce energy at night

Co-authored-by: Dave Smith <dizzyd@dizzyd.com>
2021-09-16 23:46:07 +02:00
Dave Smith
56dcc4dd16
Add support for solar energy scaling during day (#2497) 2021-09-16 23:45:38 +02:00
Dave Smith
dcca103f9a
Fix #2407: Enable overfill checking on fusion reactor energy stored (#2495) 2021-09-16 22:31:54 +02:00
Dave Smith
41422f4a66
Fix #2478; make sure to use correct units when calculating fuel usage per tick (#2499) 2021-09-16 22:25:02 +02:00
Technici4n
086ad25a47
Network energy cables (#2493) 2021-09-16 22:23:41 +02:00
Dave Smith
9d6890946d
Fix issue 2496; don't tick watermill on client side (#2498) 2021-09-15 20:40:16 +03:00
modmuss50
8c6a0155e7 Add a basic gametest to test the grinder. 2021-09-01 23:08:42 +01:00
modmuss50
6c3b461e11 Fix build and update deps 2021-09-01 21:17:58 +01:00
Technici4n
3e2b0e11ae
Initial migration to V2 Energy API (#2474)
* Initial Energy API refactor

* Allow charging in energy storage BEs

* Remove maven for experimental fabric

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-09-01 21:14:15 +01:00
drcrazy
a9850d0d61 Rock cutter is available earlier for ppl used to modded ore doubling. Closes #2463 2021-08-14 01:11:12 +03:00
drcrazy
7d415eb163 Smelt raw iridium in Industrial Blast Furnace. Closes #2467 2021-08-14 00:21:18 +03:00
drcrazy
cb747b0b67 Raw metal blocks are now smeltable. Closes #2446 2021-08-14 00:09:13 +03:00
drcrazy
38aaeabf3c Fix powered tools combat stats. Closes #2468 2021-08-12 17:22:43 +03:00
Technici4n
fd9d776b43
Initial move to the fabric fluid API (#2465) 2021-08-05 20:51:11 +01:00
modmuss50
482fe4f01f Update Trinkets api 2021-07-23 00:43:57 +01:00
modmuss50
548c12eee8 Cleanup worldgen code, should fix a lot of issues with other mods. Configuration will come later. 2021-07-20 20:16:10 +01:00
modmuss50
08e504a607 Update Gradle, loom. Give it more memory. 2021-07-20 19:15:03 +01:00
modmuss50
66c70e7e96 Fix conflicts with mojang's mappings 2021-07-20 19:03:30 +01:00
modmuss50
2ae5e8ff5b Finish 1.17.1 port 2021-07-20 19:01:38 +01:00
drcrazy
08a2cdb081 First pass on 1.17.1 update. 13 errors left 2021-07-20 03:38:43 +03:00
drcrazy
3edf36e0ef Decrease carbon footprint of Solid fuel generator. Improvement due to #2403 2021-07-19 21:04:45 +03:00
drcrazy
0932b86811 Revert fix for corner. I was looking on a wrong line on debug screen. Closes #2450 2021-07-19 16:40:46 +03:00
drcrazy
cb6c6337a8 Fix some warnings. 2021-07-19 16:15:49 +03:00
drcrazy
9cb90bb56d Bronze small dust is gone. 2021-07-19 10:55:40 +03:00
drcrazy
163d41ad85 Aluminium and brass small dusts are gone 2021-07-19 10:49:20 +03:00
drcrazy
c319e66b81 Silver and lead small dusts are gone. 2021-07-19 10:33:11 +03:00
drcrazy
1dde0f962d Fix centrifuge recipes for brass, bronze and electrum. 2021-07-18 13:51:41 +03:00
drcrazy
0cab865fdb Gold and Tin small dusts are gone. 2021-07-18 13:45:07 +03:00
drcrazy
a05b497cb2 Raw metals got "c" tags. Closes #2448 2021-07-16 02:15:43 +03:00
drcrazy
c70a8b4eb4 More loot tables for the god of loot tables. Closes #2454 2021-07-16 01:36:25 +03:00
Yan Chubikov
8c57ae4a4e
DashLoader compatibility (#2453). Thanks to alphaqu 2021-07-16 00:59:12 +03:00
Technici4n
779a2c8b60
Make 1 copper block give 9 copper plates (#2449). Thanks to Technici4n!
Copper blocks were changed to 9 copper ingots at some point during the snapshots.
2021-07-16 00:58:09 +03:00
drcrazy
b8715ecdda Gold small dust is gone. All hail gold nugget. 2021-07-07 16:28:03 +03:00
drcrazy
f9f911bf04 Fix cell rendering for modded spriteless fluids. Closes #2429 2021-07-07 14:12:34 +03:00
drcrazy
f9381b5e01 Change speed increase to time decrease. Closes #2438 2021-07-05 21:11:03 +03:00
drcrazy
5d1d5f79bb FIx breaking speed to TR ores. Closes #2425 2021-07-05 20:52:05 +03:00
drcrazy
53cd1d8f6b Fix ore drop. Closes #2427 2021-07-05 12:00:54 +03:00
drcrazy
23868443b5 Iron small dust is gone. All hail iron nugget. 2021-07-05 11:39:02 +03:00
drcrazy
5eef35551a Fix recipe outputs display in REI. Closes #2417 2021-07-03 01:11:18 +03:00
drcrazy
399f267b43 Probably fix attempt to grow rubber tree not on server. Closes #2418 and #2357 2021-07-02 22:46:49 +03:00
drcrazy
15b354fd65 Autocrafting table got proper orientation. Closes #2419 2021-07-02 17:02:00 +03:00
drcrazy
729b645cd7 Nerf clay block in extractor. Closes #2421 2021-07-02 14:18:18 +03:00
drcrazy
45725217a5 Fix end stone bricks recipe. Closes #2394 2021-07-01 20:58:23 +03:00
drcrazy
05d8c2ccc6 Fix step down buttons for Fusion reactor. Closes #2412 2021-07-01 20:37:45 +03:00
drcrazy
d5f995e7e9 Fix corner calculation for GreenhouseController 2021-06-29 12:07:29 +03:00
Thornton Fernbacher
85d69faec7
Greenhouse Controller try harvest/grow blocks in order instead of at random + growth fix (#2420). Thanks to trobol
* Greenhouse Controller try harvest/grow blocks in order
* fix greenhouse growth acceleration
2021-06-29 11:19:52 +03:00
drcrazy
5390cbfe2e Prevent easy dupe introduced by IR 2021-06-25 10:01:15 +03:00
drcrazy
42e86acba3 Raw tin, silver, lead, tungsten and iridium storage blocks 2021-06-22 17:18:36 +03:00
drcrazy
78a9a61bb4 Raw tin, silver, lead, tungsten and iridium 2021-06-21 13:58:53 +03:00
shedaniel
ecff51d498
Fix rei rendering (#2414). Thanks to shedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-21 12:24:40 +03:00
drcrazy
8f0e22d624 New textures for ores, circuits, tin and silver things 2021-06-21 11:44:14 +03:00
drcrazy
0ae56a367c Tin cable got updated texture 2021-06-21 11:27:23 +03:00
drcrazy
fa2469b034 Fix crash with casing loading. Closes #2410 2021-06-19 02:47:14 +03:00
drcrazy
8ab3b3a7be Player detector got radius config 2021-06-18 23:05:43 +03:00
drcrazy
88d5ee015a One Energy to rule them all. 2021-06-18 20:16:57 +03:00
drcrazy
193dc94f80 Fix GUI for TR Manual 2021-06-18 12:14:08 +03:00
drcrazy
75f14c145c Removed astromine compat 2021-06-18 12:13:42 +03:00
drcrazy
7216f55ba9 Copper stairs, blocks and slabs are gone. 2021-06-15 00:38:29 +03:00
drcrazy
c4011c800b Replace copper dust with raw copper in recipes 2021-06-14 22:15:38 +03:00
drcrazy
d8a11eaebf Replace gold dust with raw gold in recipes 2021-06-14 21:34:53 +03:00
drcrazy
765d96a05a Replace iron dust with raw iron in recipes 2021-06-14 21:17:11 +03:00
drcrazy
a49daa0339 Probably fixed rubber leaves drop 2021-06-14 11:14:54 +03:00
drcrazy
bff7238679 Fix advancements 2021-06-11 13:31:27 +03:00
drcrazy
b445582784 Oh no. We lost TR copper ore. All Hail MC Copper ore. 2021-06-11 02:47:25 +03:00
shedaniel
8243c936be
Update to REI 6 (#2404)
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-03 16:58:56 +01:00
modmuss50
dc216b974d Fix UU matter recipes.
Adds a PaddedShapedRecipe to RebornCore
2021-06-02 21:25:15 +01:00
modmuss50
315891885d Ensure IDSU is interdimensional. Fixes #2236 2021-06-02 20:53:20 +01:00
modmuss50
31e7b357dc Use modern java features where we can, optimise imports. 2021-05-29 20:32:05 +01:00
modmuss50
e7ab7e26d3 Fix worldgen and rubber trees. For now datapack driven worldgen isnt working. 2021-05-29 19:09:28 +01:00
Justin Vitale
ffa75aba8d Post cherry-pick updates 2021-05-29 13:43:13 +01:00
Justin Vitale
15f5392a62 Don't craft suicide when locked and recipe buffer fixes #2379 #2332 2021-05-29 13:42:25 +01:00
Fourmisain
8703856c11 temporary workaround for threading issue with REI async search (#2386) 2021-05-29 13:42:24 +01:00
vhd
2541e20693 Recycler GUI now syncs "crafting" progress with client (#2385). Thanks to vhd 2021-05-29 13:42:24 +01:00
ZerglingGo
133119f38b Update player head with changed nickname (#2383). Thanks to ZerglingGo. 2021-05-29 13:42:22 +01:00
drcrazy
638edb9196 Fix bone meal grinder recipe. Closes #2381 2021-05-29 13:42:22 +01:00
Justin Vitale
4d38eb934d Make crude storage unit wood material closes #2360 2021-05-29 13:42:21 +01:00
drcrazy
c0a0a3e256 Clay to clay ball extractor recipe. Closes #2376 2021-05-29 13:42:20 +01:00
drcrazy
875e429476 Fix chainsaw speed on nether wood. Closes #2359 2021-05-29 13:42:19 +01:00
drcrazy
e6459867e4 Fix lamp not shining on north. Closes #2371 2021-05-29 13:42:18 +01:00
drcrazy
268c7fa14b Config for Quantum Armor flight and speed. Closes #2362, #2011 2021-05-29 13:41:54 +01:00
YuRaNnNzZZ
84a418707d Fix CTM compatibility (#2372). Thanks to YuRaNnNzZZ 2021-05-29 13:41:27 +01:00
Fourmisain
9a718080d7 fix Omni-Tool, Rockcutter and Jackhammer being damageable (#2368). Thanks to Fourmisain 2021-05-29 13:41:25 +01:00
saltyseadoggo
053c8b5aee Use tags in steel and refined iron blast furnace recipes (#2367) Thanks to saltyseadoggo
* Make steel from refined iron recipe use c:coal_dusts
* Make refined iron blast furnace recipe use c:iron_ores (like those from UnEarthed)
2021-05-29 13:41:25 +01:00
saltyseadoggo
b8d3f95456 Add rubber planks to #c:planks_that_burn (#2363). Thanks to saltyseadoggo 2021-05-29 13:41:24 +01:00
drcrazy
bca4d88fd9 Fix fluid replication in fluid replicator. Closes #2352 2021-05-29 13:41:23 +01:00
drcrazy
96383ebaaf Fix crash with chunkloader placed by command. Closes #2349 2021-05-29 13:39:53 +01:00
drcrazy
8398139271 Pass stack to mining speed check. Closes #2348 2021-05-29 13:39:21 +01:00
Justin Vitale
9b8286d8fb fix #2296 - Sync server config for fluid/item storage for clients 2021-05-29 13:39:19 +01:00
Justin Vitale
4d67b3528f fix #2346 - Change head recipes from tag -> nbt to actually fetch skin 2021-05-29 13:38:24 +01:00
modmuss50
567e2f1062 Add missing files. 2021-05-29 13:20:51 +01:00
modmuss50
b33f4be5f4 1.17: TechReborn compiles and runs, big thanks to @petabyteboy
Co-authored-by: Milan Pässler <milan@petabyte.dev>
2021-05-29 13:19:29 +01:00
modmuss50
9520a3e607 Migrate mappings, 1888 errors to go 2021-05-28 14:58:12 +01:00
m44ster
44a0313361
fix recipes (#2401) 2021-05-27 00:08:49 +10:00
helpimnotdrowning
e20ff0e8b7
Fix missing texture particles on rubber leaves (#2393). Thanks to helpimnotdrowning 2021-05-06 11:06:53 +03:00
Justin Vitale
48217d0327 Don't craft suicide when locked and recipe buffer fixes #2379 #2332 2021-04-22 22:03:27 +10:00
Fourmisain
20317f20ec
temporary workaround for threading issue with REI async search (#2386) 2021-04-18 18:47:29 +01:00
vhd
584e822fa3
Recycler GUI now syncs "crafting" progress with client (#2385). Thanks to vhd 2021-04-12 14:24:51 +03:00
ZerglingGo
5fb8ec1bfa
Update player head with changed nickname (#2383). Thanks to ZerglingGo. 2021-04-07 03:32:44 +03:00
drcrazy
bab60f51ea Fix bone meal grinder recipe. Closes #2381 2021-04-06 12:05:53 +03:00
Justin Vitale
80cc130330 Make crude storage unit wood material closes #2360 2021-03-30 00:56:16 +11:00
drcrazy
f02a156c8a Clay to clay ball extractor recipe. Closes #2376 2021-03-23 13:53:34 +03:00
drcrazy
ead39e98c4 Fix chainsaw speed on nether wood. Closes #2359 2021-03-21 03:46:51 +03:00
drcrazy
585f149c16 Fix lamp not shining on north. Closes #2371 2021-03-21 03:22:10 +03:00
drcrazy
82d04496f7 Config for Quantum Armor flight and speed. Closes #2362, #2011 2021-03-19 14:09:47 +03:00
YuRaNnNzZZ
28392cd682
Fix CTM compatibility (#2372). Thanks to YuRaNnNzZZ 2021-03-19 13:42:58 +03:00
Fourmisain
50ef178191
fix Omni-Tool, Rockcutter and Jackhammer being damageable (#2368). Thanks to Fourmisain 2021-03-19 13:40:45 +03:00
saltyseadoggo
c80564484e
Use tags in steel and refined iron blast furnace recipes (#2367) Thanks to saltyseadoggo
* Make steel from refined iron recipe use c:coal_dusts
* Make refined iron blast furnace recipe use c:iron_ores (like those from UnEarthed)
2021-03-11 23:26:39 +03:00
saltyseadoggo
443c3b979d
Add rubber planks to #c:planks_that_burn (#2363). Thanks to saltyseadoggo 2021-03-05 10:20:46 +03:00
drcrazy
1c85c1e431 Fix fluid replication in fluid replicator. Closes #2352 2021-03-01 20:19:16 +03:00
drcrazy
9b47348fd3 Fix crash with chunkloader placed by command. Closes #2349 2021-02-24 12:29:15 +03:00
drcrazy
6877f6e3f2 Pass stack to mining speed check. Closes #2348 2021-02-19 13:19:30 +03:00
Justin Vitale
b1a975233a fix #2296 - Sync server config for fluid/item storage for clients 2021-02-18 01:14:27 +11:00
Justin Vitale
46eaa22eb5 fix #2346 - Change head recipes from tag -> nbt to actually fetch skin 2021-02-18 00:27:19 +11:00
drcrazy
5861d41126 QuantumArmor will reduce damage at the cost of energy. Closes #2302 2021-02-14 23:40:23 +03:00
m44ster
48d595037b
Fix for Solar panels overfill (#2339)/ Thanks to m44ster 2021-02-13 21:08:38 +03:00
drcrazy
0c9add28ff Fix license. 2021-02-08 14:02:23 +03:00
drcrazy
a49f4016d9 TankUnit IO scaled with capacity. Closes TechReborn/TechReborn/#2193 2021-02-02 21:28:15 +03:00
Justin Vitale
b01526f66d Followup #2325 continue instead of falling into the break 2021-01-15 18:09:48 +11:00
Justin Vitale
d12b31bfe4 fix #2318 - Ensure registry result is not null before rendering. 2021-01-15 00:45:42 +11:00
Justin Vitale
49a1cc1619 fix #2320 - Add null check for blockstate for effective override 2021-01-15 00:37:26 +11:00
Justin Vitale
ea0db38b6a fix #2324 - Add check for currentNeededTicks being zero 2021-01-15 00:29:07 +11:00
Justin Vitale
b9100fb19b fix #2325 - Add check for empty collection before accessing by index 2021-01-15 00:25:08 +11:00
modmuss50
d08150850d Revert "Do not start craft until it recipe is locked."
This reverts commit 3ad9f87a
2021-01-03 19:50:19 +00:00
modmuss50
607e6356a1 Allow any RC version, will change this at a later date once I revist the build script 2021-01-03 19:49:51 +00:00