Browse Source

Another Year another License Header for said year for newly modified Files

Gregorius Techneticies 11 months ago
parent
commit
e0937048e0
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 1
- 1
.meta/LICENSE.header View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *

+ 1
- 1
.meta/format_all_source_files.sh View File

@@ -8,7 +8,7 @@ LICENSE_HEADER="$(cat "$SOURCE_DIR/LICENSE.header")"
8 8
 export LICENSE_HEADER
9 9
 
10 10
 if [ -z "$1" ]; then
11
-	find "$SOURCE_DIR/../src/main/java" -newermt 20200101 -iname "*.java" -exec "$SOURCE_DIR/format_source_file.sh" {} \;
11
+	find "$SOURCE_DIR/../src/main/java" -newermt "2021-01-01 01:00:00" -iname "*.java" -exec "$SOURCE_DIR/format_source_file.sh" {} \;
12 12
 # 	find "$SOURCE_DIR/../src/main/java" -mtime -40 -iname "*.java" -exec "$SOURCE_DIR/format_source_file.sh" {} \;
13 13
 	find "$SOURCE_DIR/../src/main/resources" -iname "*.png" -mtime -10 -exec optipng -o7 -nc -clobber -silent {} \;
14 14
 else

+ 10
- 39
old_todo_list.txt View File

@@ -3,39 +3,33 @@ My old List of random shit I wanted to do. Quite a big one, most of the full sen
3 3
 -----
4 4
 
5 5
 Forge Bugs to fix, which would make things much easier:
6
-Lava ignores actual flammability when placing Fire.
7 6
 Ice Blocks harvesting Event Order is wrong and therefore cannot be modified.
8 7
 FMLProxyPacket Bug for literally any larger Modpacks
9 8
 Usage of after:* and before:* will cause crashes when used for Mod Loading Order.
10 9
 
11 10
 -----
12 11
 
13
-Yeah,the first step is electrolyzing (NH4)2SO4 solution containing H2SO4 to prepare (NH4)2S2O8.There is also a saying that 60% sulfuric acid can be used for electrolysis to directly prepare H2S2O8.
14
-Then stepwise hydrolysis in normal water and 1atm.
15
-The reaction mechanism is as follows.
16
-H2S2O8+H2O—→H2SO4+H2SO5
17
-H2SO5+H2O—→H2SO4+H2O2
18
-If you want to extract hydrogen peroxide, you can use a vacuum distillation method.
19
-
20 12
 Reactor Raytrace for Radiation
21
-Neutron Count Measurements for Sensors
22
-+1 Total Neutron per tick on Rods or RNG Neutron counts
23 13
 In reality, the treatment of chloroauric acid/chloroplatinic acid is not reduced by zinc and decomposed by heating
24
-
25 14
 AE Processors more expensive
26 15
 Redstone Graphing Device.
27 16
 Sunflower duplication for Bumblebees?
28 17
 MC Sponge prevents spreading of Waterlike Blocks.
29 18
 Silicon to SiO2 use Steam instead of Water
30
-
31 19
 Strength and Resistance Potion Buff whenever you respawn
32
-
33
-Pams alike Hazelnuts and Coconuts hanging fro mthe Tree Leaves.
34
-
20
+Pams alike Hazelnuts and Coconuts hanging from the Tree Leaves.
35 21
 Axle/Gearbox -> Rotate Entities standing on it
36 22
 Axle -> Move Entities standing on it Sideways
23
+Saw Blades on Axles
37 24
 Luminosensor => Light Update Bug?
38 25
 
26
+Yeah,the first step is electrolyzing (NH4)2SO4 solution containing H2SO4 to prepare (NH4)2S2O8.There is also a saying that 60% sulfuric acid can be used for electrolysis to directly prepare H2S2O8.
27
+Then stepwise hydrolysis in normal water and 1atm.
28
+The reaction mechanism is as follows.
29
+H2S2O8+H2O—→H2SO4+H2SO5
30
+H2SO5+H2O—→H2SO4+H2O2
31
+If you want to extract hydrogen peroxide, you can use a vacuum distillation method.
32
+
39 33
 Hydrogen Peroxide. It can be made by electrolyzing ammonium persulfate in sulfuric acid to get ammonium peroxydisulfate. Mixing that with water gives hydrogen peroxide and the ammonium persulfate back.
40 34
 Why is there no way to break potassium bisulfate back down into sulfur, oxygen, and potassium? I'm trying to make some nicads and this seems to be where my potassium us.
41 35
 Maybe try bathing silver minerals with nitric acid to get silver nitrate (don’t get it on your hands! )…
@@ -81,8 +75,6 @@ Grass Blocks grow under Ocean Water for some reason.
81 75
 
82 76
 Geostrata -> Rock Types
83 77
 
84
-Saw Blades on Axles
85
-
86 78
 KCl + Green Vitriol
87 79
 
88 80
 If you like that then you should look up some of the other early recipes for producing acids,
@@ -377,7 +369,7 @@ COMPAT:
377 369
 Pneumaticraft
378 370
 Magneticraft
379 371
 Forestry Impregnated Casing and similar Stuff
380
-Certain Machines heating up nearby players, such as the heater/burning box
372
+Certain Machines warming up nearby players, such as the heater/burning box
381 373
 Geostrata Lava Rocks, Centrifuge?
382 374
 
383 375
 TFC:
@@ -492,10 +484,6 @@ Although the surface of Mars today is inhospitable for life as we know it, plane
492 484
 
493 485
 
494 486
 
495
-
496
-
497
-
498
-
499 487
 https://en.wikipedia.org/wiki/Composition_of_Mars
500 488
 https://en.wikipedia.org/wiki/Tourmaline
501 489
 https://en.wikipedia.org/wiki/Rheniite
@@ -710,12 +698,8 @@ dustTough
710 698
 ingotTough
711 699
 
712 700
 ingotMana
713
-ingotInfinity
714 701
 ingotRunicSteel
715
-ingotCrystalMatrix
716
-ingotCosmicNeutronium
717 702
 
718
-ingotFiery
719 703
 ingotDemonic
720 704
 
721 705
 dustInfusedTeslatite
@@ -872,19 +856,6 @@ cellCablingColophony
872 856
 
873 857
 
874 858
 
875
-
876
-
877
-
878
-
879
-
880
-
881
-
882
-
883
-
884
-
885
-
886
-
887
-
888 859
 ingotAwesomeite
889 860
 ingotGelidEnderium
890 861
 dustInfusedTeslatite

+ 1
- 1
src/main/java/gregapi/recipes/handlers/RecipeMapHandlerCrushing.java View File

@@ -71,7 +71,7 @@ public class RecipeMapHandlerCrushing extends RecipeMapHandler {
71 71
 			return F;
72 72
 		}
73 73
 		ItemStack[] tOutputs = new ItemStack[aMap.mOutputItemsCount];
74
-		                         tOutputs[0] = OP.crushed.mat(aCrushedMat, UT.Code.bindStack(UT.Code.units(aCrushedAmount, U, aMultiplier, F)));
74
+								 tOutputs[0] = OP.crushed.mat(aCrushedMat, UT.Code.bindStack(UT.Code.units(aCrushedAmount, U, aMultiplier, F)));
75 75
 		if (tOutputs[0] == null) tOutputs[0] = OP.dust   .mat(aCrushedMat, UT.Code.bindStack(UT.Code.units(aCrushedAmount, U, aMultiplier, F)));
76 76
 		if (tOutputs[0] == null) tOutputs[0] = OP.gem    .mat(aCrushedMat, UT.Code.bindStack(UT.Code.units(aCrushedAmount, U, aMultiplier, F)));
77 77
 		if (tOutputs[0] == null) return F;

+ 1
- 1
src/main/java/gregtech/items/MultiItemFood.java View File

@@ -177,7 +177,7 @@ public class MultiItemFood extends MultiItemRandom implements IItemRottable {
177 177
 		IL.Comb_Tera    .set(addItem(tLastID = 30203, "Tera Comb"    , "", OD.beeComb, OD.beeCombCrossbred, TC.stack(TC.TERRA, 2)));
178 178
 		
179 179
 		
180
-		                                                                                                                                                                  
180
+																																										  
181 181
 		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Honey   .get(1), NF   , FL.Honey                                .make( 100), OM.dust(MT.WaxBee)                , IL.FR_Propolis.get(1));
182 182
 		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Water   .get(1), NF   , FL.Water                                .make(1000), OM.dust(MT.WaxBee)                );
183 183
 		RM.Centrifuge.addRecipe1(T, 16, 64, new long[] {10000,  1000}              , IL.Comb_Magic   .get(1), NF   , FL.Ambrosia                             .make( 100), OM.dust(MT.WaxMagic)              );

+ 1
- 1
src/main/java/gregtech/tileentity/energy/reactors/MultiTileEntityReactorCore1x1.java View File

@@ -351,4 +351,4 @@ public class MultiTileEntityReactorCore1x1 extends MultiTileEntityReactorCore {
351 351
 	@Override public boolean canInsertItem2 (int aSlot, ItemStack aStack, byte aSide) {return mStopped && aStack != null && aSlot == 0 && !slotHas(aSlot) && ST.item(aStack) instanceof IItemReactorRod && ((IItemReactorRod)ST.item_(aStack)).isReactorRod(aStack);}
352 352
 	@Override public boolean canExtractItem2(int aSlot, ItemStack aStack, byte aSide) {return mStopped && aStack != null && aSlot == 0;}
353 353
 	@Override public String getTileEntityName() {return "gt.multitileentity.generator.reactor.core.1x1";}
354
-}
354
+}

+ 1
- 1
src/main/java/gregtech/tileentity/energy/reactors/MultiTileEntityReactorCore2x2.java View File

@@ -409,4 +409,4 @@ public class MultiTileEntityReactorCore2x2 extends MultiTileEntityReactorCore im
409 409
 	@Override public boolean canInsertItem2 (int aSlot, ItemStack aStack, byte aSide) {return (mStopped || (mMode & B[aSlot]) != 0) && aStack != null && !slotHas(aSlot) && ST.item(aStack) instanceof IItemReactorRod && ((IItemReactorRod)ST.item_(aStack)).isReactorRod(aStack);}
410 410
 	@Override public boolean canExtractItem2(int aSlot, ItemStack aStack, byte aSide) {return (mStopped || (mMode & B[aSlot]) != 0) && aStack != null;}
411 411
 	@Override public String getTileEntityName() {return "gt.multitileentity.generator.reactor.core";} // Yeah Naming Convention doesn't work on the first one I added, just imagine a ".2x2" at the end of this String.
412
-}
412
+}

+ 1
- 1
src/main/java/gregtech/tileentity/energy/reactors/MultiTileEntityReactorRodBase.java View File

@@ -94,4 +94,4 @@ public class MultiTileEntityReactorRodBase extends TileEntityBase07Paintable imp
94 94
 	@Override public boolean canDrop(int aSlot) {return F;}
95 95
 
96 96
 	@Override public String getTileEntityName() {return "gt.multitileentity.generator.reactor.rods.empty";}
97
-}
97
+}

Loading…
Cancel
Save