maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4847 commits 1 branch 0 tags 80 MiB
Commit graph

4847 commits

This branch
This branch
All branches
Author SHA1 Message Date
modmuss50
d05ae874bd Revert "Revert later, fix build" 
This reverts commit 5bd9e826
 2020-08-14 08:44:06 +01:00
modmuss50
527ea72382 Fix rubber saplings 2020-08-14 08:42:40 +01:00
modmuss50
62ca298bc8 1.16.2 #releaseBuild 2020-08-12 08:45:22 +01:00
modmuss50
5bd9e82690 Revert later, fix build 2020-08-12 08:45:15 +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
70dedfdaa3 #releaseBuild 2020-07-25 14:34:51 +01:00
modmuss50
e7e4f8dcd8 remove pack.mcmeta fabric api handles it 2020-07-25 14:32:35 +01:00
modmuss50
bbe2347a8c #releaseBuild 2020-07-25 00:28:16 +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
modmuss50
40f1136d33 update fabric api and loader 2020-07-24 23:53:54 +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
drcrazy
c1863694f1 Update datapack version 2020-07-11 20:57:22 +03:00
drcrazy
246789c30c FabricBlockSettings updated to v1 2020-07-11 20:53:39 +03:00
Justin Vitale
c4ef977f16 Refactor and import cleanup (Excluding network PR changed files) 2020-07-09 23:04:42 +10:00
Justin Vitale
a36a0e6f4a Check multiblock before crafting vacuum freezer 2020-07-09 22:55:00 +10:00
ramidzkh
4b2042a100
Deduplicate multiblock verification from BlockEntities and Guis (#2133) 
* Deduplicate multiblock verification from BlockEntities and Guis

* Update REI

* Remove unneeded calls
 2020-07-09 22:45:04 +10:00
Justin Vitale
c89d6941ae Get state from blockstate instead of saving it as NBT resin basin 2020-07-09 20:23:06 +10:00
Justin Vitale
7eab187bbb #betaBuild 2020-07-09 19:11:11 +10:00
Justin Vitale
08245d8578
Cable distribution hotfix (#2159) 
Temp fix till networks
 2020-07-09 19:06:46 +10:00
Justin Vitale
f7f2903e39 Don't sync stack greater than 1 for locked item stack (byte overflow) 2020-07-09 17:17:14 +10:00
Justin Vitale
da8875de59 Only allow items to be inserted if empty and not locked or issametype 2020-07-09 17:06:53 +10:00
Justin Vitale
ff4ea7393b fix accessing storage unit with nothing in hand 2020-07-09 17:00:08 +10:00
Justin Vitale
501c2d68c4 Sync storedStack via NBT instead of registry (Keep tags) 2020-07-09 16:32:03 +10:00
Justin Vitale
bd860d8073 Allow players to rightclick tank unit with fluid to deposit (initial) 2020-07-09 05:02:36 +10:00
Justin Vitale
fdc5a629d8 Return if client 2020-07-09 04:46:36 +10:00
Justin Vitale
61345c0fa4 Storage unit text display, QOL withdraw by attacking, misc sync fixes 2020-07-09 04:21:25 +10:00