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

2171 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel
c855faa14e Fix that so pollution is not negative. 2017-05-09 06:39:35 +02:00
Dream-Master
b9ad640d99 Change time 16cable needs 
lower infinity ingots a bit zpm2
 2017-05-08 22:35:28 +02:00
Dream-Master
946ac48e46 fic Gears and Rings 
bump version
 2017-05-07 23:16:11 +02:00
Technus
80e853058a Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH 
# Conflicts:
#	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
 2017-05-07 22:26:45 +02:00
Technus
8e0e51673f another oil rewrite, even more BloodAsp like 2017-05-07 22:21:44 +02:00
Dream-Master
af5574914a change Texture a bit(Good Circuit) 2017-05-07 21:54:04 +02:00
Dream-Master
23c31ce7d6 remove todo 2017-05-07 19:12:13 +02:00
Dream-Master
bef7dfe562 added small and large Spring Shaped crafting 2017-05-07 18:11:31 +02:00
Dream-Master
d95fedd30e this code is obsolete because shows double recipes in nei. 
change recipes like it was before. Ring and Stick processing
 2017-05-07 18:04:51 +02:00
Dream-Master
72d1aaa5bb Solar Panels to Core Mod 2017-05-07 17:27:22 +02:00
Dream-Master
f8f6665114 maybe this works 2017-05-07 17:14:32 +02:00
Dream-Master
4944f7e17d remove GalliumArsenic recipe ingot alloying from ebf 2017-05-07 13:05:50 +02:00
Dream-Master
b990b43915 bump version 2017-05-07 11:26:16 +02:00
Dream-Master
f6bda6c27c reverted it because not working 2017-05-07 11:18:44 +02:00
Dream-Master
3459909e28 try to make it public because jenkins cant build it 
11:11:20 :compileJavawarning: /var/lib/jenkins/.gradle/caches/modules-2/files-2.1/magneticraft/0.6.1-final/f8b88d8a61499d4a9fd0b979f3d3945e8809623a/magneticraft-0.6.1-final.jar(com/cout970/magneticraft/api/access/MgRecipeRegister.class): major version 52 is newer than 51, the highest major version supported by this compiler.
11:11:20   It is recommended that the compiler be upgraded.
11:11:22 /var/lib/jenkins/workspace/Gregtech-5-Unofficial/build/sources/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java:156: error: Entry is not public in HashMap; cannot be accessed from outside package
11:11:22       for (HashMap.Entry<ChunkPosition, FluidStack> fl : tFluids.entrySet()) {
 2017-05-07 11:14:50 +02:00
Dream-Master
46c5ea1e6a move circuit recipe to core mod 2017-05-07 11:00:45 +02:00
Technus
97042f0d48 Expand low grav dimensions 2017-05-06 22:12:09 +02:00
Technus
ab48a95372 Minor cleanup 2017-05-06 21:51:07 +02:00
Technus
8f74a61162 Remove compiletime dependency of CoreMod, Add runtime dependency of CoreMod 
+optimize imports
+add ToDo for dream to migrate the recipes to coremod
 2017-05-06 10:10:20 +02:00
Technus
4026e87c3f Revert Dream's doings, re enable materials 2017-05-06 09:53:19 +02:00
Technus
22a76ced74 Enable materials if coremod is loaded 2017-05-06 09:38:52 +02:00
Dream-Master
65e0b3028e remove this material dependencies 2017-05-06 00:41:06 +02:00
Dream-Master
e9050a91d0 Wafer and Circuits get different Textures. 
@Technus if you make better one sure add it.
 2017-05-05 23:27:08 +02:00
Dream-Master
cddbb0bbf1 remove enable or disable solar panel recipes because always enable. Move recipe to crafting recipe section 2017-05-05 21:50:57 +02:00
Dream-Master
ac63fa352c all Cable recipes changes done 
processing ingots= nuggets fix
remove gt solar recipes and put them into core mod
 2017-05-05 21:09:59 +02:00
Technus
d846ba0ee4 Added cableGT16 processing 2017-05-05 10:32:44 +02:00
Technus
beacdec1d7 Add gem upgrading recipes 2017-05-05 10:05:13 +02:00
Technus
b6c708af8c Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH 2017-05-05 09:49:38 +02:00
Technus
39be4ae1ed EBF 20000K disable auto genned recipe support 2017-05-05 09:49:18 +02:00
Dream-Master
d4c82ae844 recipe fix 2017-05-05 00:30:56 +02:00
Dream-Master
79f666099a battery recipes 2017-05-05 00:22:05 +02:00
Dream-Master
63ff793f29 more recipe nerfs 
circuits, wafer etc
 2017-05-05 00:05:12 +02:00
Dream-Master
5d9f752e6e more component recipe changes 2017-05-04 09:47:37 +02:00
Dream-Master
f4e88cb51d a few chip recipe changes, png changes 2017-05-02 23:57:20 +02:00
Dream-Master
f2bb29d4b5 more Board recipe and balancing changes 2017-05-02 22:32:24 +02:00
Dream-Master
6cc7e7f0d8 fixed Board recipes a bit 2017-05-02 22:17:13 +02:00
Dream-Master
dd4754c733 removed unused pngs 2017-05-02 22:14:25 +02:00
Dream-Master
c7c207038f make things more easy and realistic 2017-05-02 22:10:44 +02:00
Dream-Master
8efc90b6f6 more recipes changed 2017-05-01 22:55:54 +02:00
Dream-Master
748cbf8a5a added cutter and Chemical reactor to cleanroom (optional recipes) 
a few recipe changes
 2017-05-01 17:55:23 +02:00
Dream-Master
ab44824714 more advanced circuit Board changes 2017-05-01 14:35:08 +02:00
Dream-Master
086e2a1dcb new Etched wire recipes 2017-05-01 13:10:44 +02:00
Dream-Master
7257c60326 Added back Etched wires 
Added new Bords
 2017-05-01 12:38:15 +02:00
Technus
254306ebfd Not needed 2017-05-01 10:28:29 +02:00
Technus
f2b8bbdde8 Optimize imports 2017-05-01 10:24:30 +02:00
Technus
80bf3fd2e6 Not needed. 2017-05-01 09:40:28 +02:00
Technus
bd816f505b Random text changes. 2017-05-01 08:22:53 +02:00
Technus
cb0f1d4d2c Merge branch 'mergeGTNH' of https://github.com/GTNewHorizons/GT5-Unofficial into mergeGTNH 2017-05-01 08:22:05 +02:00
Technus
c12e474c23 Oil and pollution overhaul 2017-05-01 08:18:30 +02:00
Dream-Master
417d45d257 Added Advanced Fiber Glass Board 
Few recipe changes
 2017-05-01 00:00:44 +02:00