Commit graph

4291 commits

Author SHA1 Message Date
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
modmuss50
286cf17811 Use new getTorusSizeCache 2021-01-01 19:29:43 +00:00
drcrazy
b7fa791649 #releaseBuild 2020-12-28 14:42:18 +03:00
drcrazy
3370acf61c Fix smelting rubber logs. Closes #2315 2020-12-28 14:13:21 +03:00
drcrazy
1c8b8e6e58 Ability to grind whole coal block at once. Closes #2293 2020-12-21 18:05:23 +03:00
modmuss50
8add71f5ac Port to new fabric networking api 2020-12-20 22:27:01 +00:00
modmuss50
2ea779acd1 Dont allow batteries to charge other batteries in the inv. Fixes https://github.com/TechReborn/TechReborn/issues/2297 2020-12-20 21:43:53 +00:00
modmuss50
2ea118ec63 Optimise Iron furnace recipe lookup 2020-12-20 21:24:05 +00:00
drcrazy
af62a85677 Chunkloader handles wrench properly. Closes #2308 2020-12-18 16:40:15 +03:00
drcrazy
b720fa99b9 Recycler should use energy. Closes #2304 2020-12-18 16:07:39 +03:00
drcrazy
c9c1850e43 Use internal map in RebornRegistry.registerBlockNoItem method 2020-11-20 16:26:32 +03:00
drcrazy
c3aa9761c2 Oh The Biomes You'll Go Compat. Closes #2276 2020-11-19 16:56:28 +03:00
drcrazy
0c6513b252 Nerf Jackhammer speed on ores. Closes #2246 2020-11-17 15:31:33 +03:00
drcrazy
2407286b58 Fix unpowered speed for chainsaw. Closes #2268 2020-11-17 00:58:11 +03:00
drcrazy
d84a0133a4 Batteries can't get mending anymore. Closes #2263 2020-11-16 20:09:27 +03:00
drcrazy
a836f45600 Fix drop for solid canning machine. Closes #2290 2020-11-16 16:18:51 +03:00
Kat
b96e64365d
Recipe fixes for Grinding head, wrench and painting tool. Kudos to Birgliss
* Remove Bronze Nuggets from recipes.
* Buff Diamond Grinding Head output.
2020-11-16 16:14:22 +03:00
drcrazy
3ad9f87a6a Do not start craft until it recipe is locked. 2020-11-14 16:57:15 +03:00
drcrazy
05a55a3294 Partially recipe output zindex. Closes #2288 2020-11-14 16:25:25 +03:00
drcrazy
69506d82f4 Astromine compat plates. Closes #2259 2020-11-14 11:44:09 +03:00
modmuss50
d835a8be01 CableElectrocutionEvent 2020-11-13 17:19:05 +00:00
drcrazy
9fc506b517 Fix blockus barrels in storage unit recipe. Closes #2274 2020-11-12 21:58:54 +03:00
drcrazy
4512800eff No title for inventory. Closes #2287 2020-11-12 21:40:33 +03:00
drcrazy
7b47304ec0 Grinder compat for astromine. Closes #2257 2020-11-12 21:33:55 +03:00
drcrazy
aa7caec935 Translation for Fusion Coil tooltip 2020-11-12 15:28:00 +03:00
drcrazy
6f21bc9fd5 Tags for silicon plates. Closes #2284 2020-11-10 19:11:09 +03:00
drcrazy
b460e0791e Tooltip refactoring 2020-11-10 18:38:25 +03:00
modmuss50
82f8a13f15 Fix rubber sapling, closes #2281 2020-11-09 18:41:36 +00:00
modmuss50
0695250078 Pass the worlgen json's through the ConditionManager 2020-11-09 18:34:52 +00:00
DaFuqs
9e78f8910e
Use tags for all vanilla ores in grinding recipes (unearthed compat) (#2283) 2020-11-09 18:42:26 +03:00
drcrazy
3cf57044ce Rubber sapling could be potted. Closes #2279 2020-11-08 20:53:58 +03:00
drcrazy
86765feb92 Grinder tag for diamond ore. Closes #2275 2020-11-08 19:02:59 +03:00
Justin Vitale
81f033ceec Add smeltable items to fuel registry closes #2278 2020-11-08 21:46:44 +11:00
drcrazy
4a74cdf506 More tags in recipes. Closes #2270 2020-11-05 14:39:03 +03:00
drcrazy
d36a61be39 Update to release version of 1.16.4 2020-11-05 14:31:28 +03:00
modmuss50
234250fca2 Nerf solar panels 2020-11-01 20:17:27 +00:00
modmuss50
883d2773fd Remove recipe exploit 2020-11-01 20:15:37 +00:00
modmuss50
5d41fe7d7c Nerf gem tools, remove config option to skip registering them as conditional registration is a bad idea, use mods such as KubeJS to hide the items. 2020-11-01 20:15:07 +00:00
modmuss50
98857f5119 First pass on data driven worldgen 2020-11-01 20:08:19 +00:00
modmuss50
1d00090cb4 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-10-30 21:03:04 +00:00
modmuss50
416cd647a2 Dep updates 2020-10-30 21:02:41 +00:00
drcrazy
a4d1ff03f5 No sap from player placed rubber wood. Closes #2212 2020-10-30 02:15:50 +03:00
drcrazy
81aa7e7ec2 More translations for TR & RC 2020-10-30 00:41:14 +03:00
drcrazy
c41be06bf1 Translation for powered items. 2020-10-29 21:22:04 +03:00
drcrazy
3645c156be Added translation for upgrades 2020-10-29 17:24:38 +03:00
drcrazy
f5107cacd0 Couple of warnings 2020-10-29 15:13:05 +03:00
drcrazy
fae818db1c Charge-o-Mat back in business. Closes #2264 2020-10-29 15:06:53 +03:00
drcrazy
3f0bd099d5 Fix drain container. Closes #2261 2020-10-27 15:23:08 +03:00
Roman Hubenkov
8fba862e2a
Update en_us.json (#2260) Thanks to Romz24 for spotting
* Update en_us.json
2020-10-27 00:27:19 +03:00
drcrazy
fef6d8f149 Added recipes for ancient debris. Closes #2254 2020-10-26 14:31:03 +03:00
drcrazy
75e7e626f9 Fix cells to tank drain. Closes #2239 2020-10-24 15:40:08 +03:00
drcrazy
ebc45ff9f8 Fix warnings in GUI 2020-10-24 10:29:05 +03:00
drcrazy
ca24d58f86 Fix tooltip 2020-10-24 00:30:37 +03:00
drcrazy
342917851b Fix license 2020-10-21 01:37:31 +03:00
drcrazy
aa18079315 Use new canAccept/canProvide methods 2020-10-21 01:15:36 +03:00
drcrazy
df974ef5da Fixes due to PowerAcceptorBE changes. 2020-10-20 17:21:27 +03:00
drcrazy
09d9d6e7ea Recipe for chunkloader. Some work on #2244 2020-10-15 11:38:33 +03:00
drcrazy
1aea09d7c9 Use tags in some recipes. Closes #2245 and #2247 2020-10-14 14:14:51 +03:00
drcrazy
bf603744a5 Jackhammers can't break obsidan anymore. Closes #2235 2020-10-06 23:00:49 +03:00
drcrazy
742046095b Jackhammers can't break obsidan anymore. Closes #2235 2020-10-06 23:00:19 +03:00
drcrazy
b6641ad2ba Fix omni-tool ore mining. Closes #2196 2020-10-05 17:16:54 +03:00
drcrazy
3a159d7437 Fix drill speed on non-stone blocks. Closes #2225 2020-10-03 21:38:15 +03:00
Virtuoel
a4bceb32a8
Fix properties being recreated for several blocks (#2238) 2020-10-02 12:57:12 +01:00
drcrazy
7ba962196b Lamps require energy to work. Again. Closes #2227 2020-09-25 00:54:48 +03:00
drcrazy
22b0cdfe23 Should fix crash with wrenched storage units. Closes #2183 2020-09-24 23:30:25 +03:00
modmuss50
19f7e17f7d 1.16.3 - just mappings 2020-09-19 14:30:12 +01:00
drcrazy
86014001ba Batteries should be able to charge items when active. Closes #2099 2020-09-18 20:40:42 +03:00
drcrazy
0b13213489 Jackhammers should have correct speed. Closes #2223, #2217 2020-09-16 03:21:12 +03:00
drcrazy
b1fee2e741 JackHammers should respect ores when AoE mining. 2020-09-16 00:43:28 +03:00
drcrazy
1360187f16 Creative tank will void excessive fluid. Closes #2205 2020-09-10 16:19:55 +03:00
modmuss50
1c376d4aea Merge remote-tracking branch 'origin/1.16' into 1.16 2020-09-09 17:58:30 +01:00
modmuss50
4b6036530c Remove LibCD support due to it needing a rewirite.
I will happyily accept a PR to bring this back, right now I dont have the time to do so and its causing major issues (hard crashes)
2020-09-09 17:57:43 +01:00
drcrazy
92bdb4112f Creative storage unit will void excessive input items. Some work on #2205 2020-09-09 14:33:52 +03:00
drcrazy
efad3e6411 Formatting for PlayerDetectorBlock 2020-09-08 16:00:20 +03:00
Justin Vitale
bb13b2cafc Improve cell/bucket withdrawing from tank closes #2209
Not perfect but solved the problem on the issue
2020-09-07 02:10:50 +10:00
drcrazy
c05819729f Fix Greenhouse hologram. Closes #2195 2020-09-01 20:44:52 +03:00
drcrazy
25632466ed Rubber wood strip logic moved to a separate class 2020-08-28 13:09:14 +03:00
shartte
f733ec3065
Added back initial Applied Energistics 2 compatibility. (#2199) 2020-08-23 23:25:30 +01:00
drcrazy
2eef16080b Fix FoV for quantum leggings. Closes #2198 2020-08-23 20:30:04 +03:00
drcrazy
75617a7d72 Drop wooden plate on cover remove. Closes #2190 2020-08-20 21:52:05 +03:00
drcrazy
2daf57e19c Cleanup of CableBlockEntity 2020-08-20 21:42:29 +03:00
Justin Vitale
5df411f26d Revert back to OG getMiningSpeedMultiplier closes #2185 2020-08-20 20:42:10 +10:00
Justin Vitale
80049c8c62 Fix #2197 and add ability to withdraw via right click [only bucket/cell] 2020-08-19 20:55:38 +10:00
modmuss50
527ea72382 Fix rubber saplings 2020-08-14 08:42:40 +01:00
modmuss50
bd88aabe68 Merge remote-tracking branch 'origin/1.16' into 1.16 2020-08-12 08:36:56 +01:00
drcrazy
dc1e459ad6 Discharge cable on shock. Closes #2178 2020-08-09 21:01:07 +03:00
modmuss50
0b3cb646ce Fix major worldgen issues 2020-08-08 17:01:48 +01:00
modmuss50
6e001dd9cc 1.16.2-rc1 2020-08-07 21:51:48 +01:00
modmuss50
cfd9c7f10c Rewrite world gen, in preperation for json based config files 2020-08-02 15:41:28 +01:00
modmuss50
46fe49ebe5 Fix ore gen 2020-08-02 14:05:52 +01:00
modmuss50
619fd39df3 Mappings update 2020-08-02 13:44:25 +01:00
modmuss50
6e0fc6af61 first pass on 1.16.2 - no world gen 2020-07-29 19:42:39 +01:00
Deximus-Maximus
a0644ac434
AutoSwitch support (#2175). Thanks to dexman545 2020-07-28 15:13:19 +03:00
KnatteAnka
d0c32e8efb
Add rails and minecart to blast furnace to get iron back. (#2177) Thanks to KnatteAnka
* Adding Iron from Mincart 
* Adding Iron from Rail
2020-07-28 13:56:07 +03:00
modmuss50
ec1ae17134 Show a bounding box around all the blocks that are going to be broken.
Also fixes some slight issues.
2020-07-26 17:04:45 +01:00
modmuss50
b5707b144e Some general cleanup 2020-07-26 16:19:33 +01:00
modmuss50
bbc9dd3b37 Cleanup jackhammer code a bit 2020-07-26 16:08:19 +01:00
modmuss50
a1e3df3c4a Rebalance drill speed and mining level 2020-07-26 15:56:05 +01:00
modmuss50
481634d29f Add a basic fallback model for the bucket and cells when no renderer is present. 2020-07-25 19:22:15 +01:00
modmuss50
e7e4f8dcd8 remove pack.mcmeta fabric api handles it 2020-07-25 14:32:35 +01:00
modmuss50
18a08b798e Merge remote-tracking branch 'origin/1.16' into 1.16
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
2020-07-25 00:23:59 +01:00
modmuss50
65a15910cd Fix #2170 2020-07-25 00:12:39 +01:00
modmuss50
b4a0e147e1 Fix #2147 2020-07-25 00:06:44 +01:00
modmuss50
ec7935570f Remove stack hud its annoying, and I have better ideas 2020-07-25 00:01:15 +01:00
modmuss50
0106b00add Fix (well add) ore mining levels 2020-07-24 23:56:47 +01:00
Kato
4e196f6b58
Create soul_soil.json (#2168)
* Create soul_soil.json

Copy of the centrifuge soul_sand recipe, but for soul_soil
I'm sorry, I don't know if I need to add a reference to this recipe anywhere else.

* Update soul_soil.json

Adjusted the recipe to return 8 minecraft:dirt instead of 10 minecraft:sand.  Lowered the amount of dirt, because it's more dynamic than sand for processing it further.  According to REI, this would be the first TR recipe to provide dirt. (besides the scrapbox)
2020-07-19 21:48:46 +10:00
drcrazy
90521007bb Small cleanup 2020-07-18 19:30:08 +03:00
shedaniel
01663648c4
Epic REI displays. Thanks to shedaniel! (#2167)
* Epic REI displays

Signed-off-by: shedaniel <daniel@shedaniel.me>

* use the AbstractEnergyConsumingMachineCategory for ElectrolyzerCategory

Signed-off-by: shedaniel <daniel@shedaniel.me>
2020-07-18 18:58:35 +03:00
KnatteAnka
140ff2f365
wool > string (extractor), gravel > flint (extractor) and gravel > sand (grinder) closes #2164 (#2165)
* Add Flint to Extractor

* Add String from Wool

* Delete Flint in Grinder moved to Extractor

* Update string_from_wool.json

Co-authored-by: Justin Vitale <4002351+justinvvitale@users.noreply.github.com>
2020-07-17 13:52:03 +10:00
Prospector
011d43fefd
Fix #2163 2020-07-13 09:16:47 -07:00
Justin Vitale
64bf5edd57 Tidy up Storage Unit Renderer with new found knowledge 2020-07-13 22:01:41 +10:00
drcrazy
7643220d4b Stairs, Walls and Slabs got their names 2020-07-11 21:34:37 +03:00