Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions
1300 commits 8 branches 203 tags 97 MiB
Commit graph

112 commits

Author SHA1 Message Date
Blood-Asp
f657b3d0c6 Fix Pyrooven textures 2017-07-06 23:16:26 +02:00
Johannes Gäßler
34058f0e1e Fixed Diluted Sulfuric Acid recipes, PTFE Pipe Casing name 2017-07-02 12:25:33 +02:00
Johannes Gäßler
ddf58e6ef4 Merge branch 'unstable_blood' into unstable 
Conflicts:
	src/main/java/gregtech/api/enums/MaterialBuilder.java
	src/main/java/gregtech/common/GT_RecipeAdder.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-26 20:25:32 +02:00
Johannes Gäßler
f698d3f8e0 Merge branch 'BrickedBlastFurnace' into unstable 
Conflicts:
	src/main/java/gregtech/GT_Mod.java
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/common/GT_Proxy.java
	src/main/java/gregtech/common/blocks/GT_Block_Casings4.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-25 23:45:45 +02:00
Technus
850f30a9d7 Extra fix for: https://github.com/Blood-Asp/GT5-Unofficial/issues/1098 2017-06-25 12:28:11 +02:00
Technus
6abdc95c0c Optimize imports - intelliJ one button action 2017-06-25 12:09:46 +02:00
Johannes Gäßler
14b9332d14 Moved the Casings for the Large Chemical Reactor again. 
As it turns out overwriting Casings 4.4 and 4.5 was not a good idea
because even though there is no actual Casing at those IDs, the textures
are in use.

I started a new batch of Casings (GT_Block_Casings8) at IDs 112-127.
I did not use IDs 80-95 because there seem to already be some textures
there.
I did not use IDs 96-111 because they seem to already be in use by
Technus.
 2017-06-22 01:50:21 +02:00
Johannes Gäßler
337b6fc66d Merge branch 'ChemistryUpdate' into unstable 
Conflicts:
	src/main/java/gregtech/api/enums/ItemList.java
	src/main/java/gregtech/api/enums/Textures.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-18 00:17:03 +02:00
Johannes Gäßler
b73a2e0017 Implemented crafting recipes for the Bricked Blast Furnace 
fixed Glass Hammering consuming 40x more energy than intended

Fixed Hammer recipes that (presumably unintentionally) had 10EUt, 16
ticks instead of 16EUt, 10 ticks.

Renamed Dense Bricks -> Firebricks
 2017-06-17 23:39:51 +02:00
Blood-Asp
909149cd28 Merge pull request #1074 from Techlone/advminer2_improvements 
AdvMiner2 renamed; new tiers of OreDrillingPlant
 2017-06-17 14:37:10 +02:00
Johannes Gäßler
de42d1da42 Merge remote-tracking branch 'GT5-Unofficial-Fork/ChemistryUpdate' into 
BrickedBlastFurnace

Conflicts:
	src/main/java/gregtech/api/enums/Materials.java
	src/main/java/gregtech/api/enums/Textures.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
 2017-06-17 01:02:38 +02:00
Blood-Asp
650a105e00 Fix hiding of unused ores. #1062 2017-06-15 23:49:16 +02:00
Johannes Gäßler
34474480f7 Merge remote-tracking branch 'origin/unstable' into ChemistryUpdate 
Conflicts:
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
	src/main/java/gregtech/loaders/load/GT_FuelLoader.java
	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
	src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
 2017-06-15 12:28:14 +02:00
Blood-Asp
c397df4523 make reinforced blocks prevent monsterspawns 2017-06-14 01:19:56 +02:00
Johannes Gäßler
6d15192990 Implemented Bricked Blast Furnace, added corresponding textures 
Added a new Casing for the Bricked Blast Furnace, GT_Block_Casings4, ID
15

Refactored the non-electric Blast Furnaces:
The Bronze Blast Furnace and the Bricked Blast Furnace extend a
superclass to ensure consistent behavior.
Subclasses only differ in texture, description, and Casing Block.
 2017-06-08 23:22:08 +02:00
Techlone
86318b7b44 Merge branch 'unstable' into advminer2_improvements 
# Conflicts:
#	src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
 2017-06-07 18:17:23 +05:00
Blood-Asp
9032c2e15b Quick fixes 2017-06-07 09:45:19 +02:00
Blood-Asp
1296755b27 Merge branch 'refs/heads/pr/1077' into unstable 
# Conflicts:
#	src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
 2017-06-07 09:37:13 +02:00
Blood-Asp
425a6d1cea forgot to commit the oredict changes 2017-06-06 23:58:30 +02:00
Technus
8293ac9d5c this actually changes the raytracer boxes reusing the collision boxes 2017-06-05 15:23:37 +02:00
Johannes Gäßler
d0247a5d73 Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5 
Limited the minimal recipe time for the LCM to 2 ticks to avoid bugs.
 2017-06-04 20:19:07 +02:00
Techlone
5df32b69ab Merge branch 'unstable' into advminer2_improvements 2017-06-04 21:31:08 +05:00
Blood-Asp
b0049786b7 Make Casings and reinforced blocks transfer redstone signals 2017-06-02 18:15:29 +02:00
Techlone
75a33be210 Fix OreDrill; fix getting block in ItemList; some changes in addInformation - need check this 2017-06-01 20:23:13 +05:00
Techlone
b187410005 AdvMiner rewriting; now it's Ore Drilling Plant 
Four tiers of Ore Drilling Plant
I - radius is 3 chunks MV+ (default)
II - radius is 4 chunks HV+
III - radius is 6 chunks EV+
IV - radius is 9 chunks IV+

New behavior:
- pick pipes after mining finish
- extract ore block before moving down
 2017-06-01 00:01:32 +05:00
Johannes Gäßler
a16ea6bbc7 Changed the Layout of the LCM to 3x3x3, tweaked the name of casings and 
the descriptions of multiblocks to make them consistent.
 2017-05-13 23:08:50 +02:00
Johannes Gäßler
3cf169b5c3 Added crafting recipes for the LCH 2017-05-12 22:50:29 +02:00
Johannes Gäßler
0c2dee56da Added new textures for the LCM, using them now 2017-05-09 21:51:49 +02:00
Johannes Gäßler
7bc06a3969 Implemented checkMachine for the LCR, added machine casings 2017-05-08 00:11:36 +02:00
Blood-Asp
d725c463e5 null check to prevent bukkit crash 2017-03-31 16:14:36 +02:00
dohyun22
15db129b1d simplified the code. 2017-03-25 18:53:21 +09:00
dohyun22
945a13d4ae Fixed various Bugs on the Powderbarrel. 
Fixed PrimedTNT Entity being spawned on client side when destroyed by player.
Fixed PrimedTNT Entity spawning at misplaced location (about 0.5m from the center of the block).
Fixed fuse sound not being played when ignited.
Fixed Powderbarrel not being able to spawn PrimedTNT Entity when destroyed by explosion.
 2017-03-24 12:24:02 +09:00
Blood-Asp
5a7e797883 Reduce Plascrete Mininglevel and hardness/resistance 2017-03-23 20:34:54 +01:00
Blood-Asp
b6674c9d96 Finish Cleanroom 2017-02-11 01:04:46 +01:00
Dimach
d51f43f97b Ore harvest level rework. Fixed #730. 2016-12-13 20:20:36 +01:00
Blood-Asp
11130dd435 More Translation stuff. Hope it does not lag. 2016-10-26 21:57:20 +02:00
Blood-Asp
2d5c40ef8f some bugfixes 2016-10-26 00:57:33 +02:00
Blood-Asp
49ff6ffa31 Wrench shift click can move machine front direction 2016-10-21 20:12:23 +02:00
Blood-Asp
187a49f43c Some Block fixes 2016-10-19 22:27:27 +02:00
Blood-Asp
a70ce1a67b Cleanup recipe classes 2016-10-19 13:37:36 +02:00
Blood-Asp
fa79dcd263 Base IC2 Classic compat. Reactor components disabled, some recipes likely missing/broken 2016-10-16 18:08:26 +02:00
Muramasa
ce632479bc Hide some unused blocks in NEI 2016-10-13 18:52:21 +01:00
Muramasa
173700a611 Computronics support & Improved mod dependant Materials 2016-10-04 04:12:40 +01:00
Muramasa
c0f1fce859 Small fixes & Stop storage blocks and fluids for disabled materials 2016-09-29 07:36:45 +01:00
Muramasa
fed8109b17 Update with exp changes 2016-09-24 23:05:18 +01:00
Blood-Asp
380211de8a fix orehiding hiding all ores instead of only the unneeded. 2016-09-24 19:56:58 +02:00
Muramasa-
8f2e13681b Merge pull request #632 from Muramasa-/Bugfixes 
Various Bugfixes
 2016-09-20 17:03:18 +01:00
Muramasa
a03fc7fc1d That didn't work 2016-09-17 13:27:03 +01:00
Muramasa
769362d60b Reduce Marble/Basalt harvest level and setOreBlock fixes 2016-09-16 15:42:27 +01:00
Muramasa
e981c0db30 One more conflict 2016-09-16 00:27:47 +01:00