github/GT5-Unofficial.git - Unnamed repository; edit this file 'description' to name the repository.

about summary refs log tree commit diff

diff options

author	Jordan Byrne <draknyte1@hotmail.com>	2017-12-24 11:54:30 +1000
committer	Jordan Byrne <draknyte1@hotmail.com>	2017-12-24 11:54:30 +1000
commit	ecf908e98ccee72a713091e8ab547e35a41d7436 (patch)
tree	f0dade1481aa02fd0ac4fcf8a672cc7a761a0547
parent	b9fe3352840abe0846834cefd578895ec6f5e520 (diff)
parent	fa5de3584ce7bc97ce6f32b31f6062b5b6e89e75 (diff)
download	GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.gz GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.tar.bz2 GT5-Unofficial-ecf908e98ccee72a713091e8ab547e35a41d7436.zip

> Why does Git make me do these? arghhh...

Merge branch 'master' of https://github.com/draknyte1/GTplusplus # Conflicts: # src/Java/gtPlusPlus/core/material/ALLOY.java # src/Java/gtPlusPlus/core/material/ELEMENT.java # src/Java/gtPlusPlus/core/material/Material.java # src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java

-rw-r--r--

2

-rw-r--r--

4

-rw-r--r--

src/Java/cofh/energy/EnergyStorage.java

12

-rw-r--r--

src/Java/cofh/energy/IEnergyHandler.java

20

-rw-r--r--

src/Java/cofh/energy/ItemEnergyContainer.java

12

-rw-r--r--

src/Java/cofh/energy/TileEnergyHandler.java

21

-rw-r--r--

src/Java/gregtech/api/util/CustomRecipeMap.java

48

-rw-r--r--

src/Java/gregtech/api/util/MultiblockRecipeMapHandler.java

18

-rw-r--r--

src/Java/gregtech/api/util/Recipe_GT.java

52

-rw-r--r--

src/Java/gtPlusPlus/GTplusplus.java

118

-rw-r--r--

src/Java/gtPlusPlus/GTplusplus_Secondary.java

130

-rw-r--r--

src/Java/gtPlusPlus/api/analytics/AnalyticsLoggingPlugin.java

10

-rw-r--r--

src/Java/gtPlusPlus/api/analytics/SegmentAnalytics.java

4

-rw-r--r--

src/Java/gtPlusPlus/api/objects/CSPRNG.java

8

-rw-r--r--

src/Java/gtPlusPlus/api/objects/Logger.java

139

-rw-r--r--

src/Java/gtPlusPlus/core/block/ModBlocks.java

5

-rw-r--r--

src/Java/gtPlusPlus/core/block/base/BlockBaseFluid.java

102

-rw-r--r--

src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java

13

-rw-r--r--

src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java

15

-rw-r--r--

src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java

25

-rw-r--r--

src/Java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java

21

-rw-r--r--

src/Java/gtPlusPlus/core/commands/CommandMath.java

50

-rw-r--r--

src/Java/gtPlusPlus/core/common/CommonProxy.java

27

-rw-r--r--

src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/config/ConfigHandler.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/container/Container_HeliumGenerator.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/container/Container_ModularityTable.java

21

-rw-r--r--

src/Java/gtPlusPlus/core/container/Container_ProjectTable.java

16

-rw-r--r--

src/Java/gtPlusPlus/core/container/Container_TradeTable.java

17

-rw-r--r--

src/Java/gtPlusPlus/core/container/Container_Workbench.java

40

-rw-r--r--

src/Java/gtPlusPlus/core/container/Container_WorkbenchAdvanced.java

40

-rw-r--r--

src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/entity/monster/EntityStaballoyConstruct.java

391

-rw-r--r--

src/Java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java

5

-rw-r--r--

src/Java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java

3

-rw-r--r--

src/Java/gtPlusPlus/core/gui/machine/GUI_TradeTable.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/handler/BookHandler.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/handler/COMPAT_HANDLER.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/handler/GuiHandler.java

10

-rw-r--r--

src/Java/gtPlusPlus/core/handler/OldCircuitHandler.java

8

-rw-r--r--

src/Java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java

20

-rw-r--r--

src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java

11

-rw-r--r--

src/Java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java

10

-rw-r--r--

src/Java/gtPlusPlus/core/handler/events/SneakManager.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/handler/events/UnbreakableBlockManager.java

50

-rw-r--r--

src/Java/gtPlusPlus/core/handler/events/ZombieBackupSpawnEventHandler.java

8

-rw-r--r--

src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/inventories/InventoryWorkbenchHoloSlots.java

14

-rw-r--r--

src/Java/gtPlusPlus/core/item/ModItems.java

35

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/BaseItemDamageable.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/CoreItem.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java

34

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java

12

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java

3

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot.java

8

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java

3

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java

8

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockNBT.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/ore/BaseItemCrushedOre.java

10

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java

153

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/rods/BaseItemRodLong.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/bauble/ModularBauble.java

8

-rw-r--r--

src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java

12

-rw-r--r--

src/Java/gtPlusPlus/core/item/general/ItemHealingDevice.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/general/capture/ItemEntityCatcher.java

58

-rw-r--r--

src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java

1

-rw-r--r--

src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java

1

-rw-r--r--

src/Java/gtPlusPlus/core/item/init/ItemsMultiTools.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java

13

-rw-r--r--

src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java

34

-rw-r--r--

src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java

30

-rw-r--r--

src/Java/gtPlusPlus/core/lib/CORE.java

14

-rw-r--r--

src/Java/gtPlusPlus/core/lib/LoadedMods.java

92

-rw-r--r--

src/Java/gtPlusPlus/core/material/ALLOY.java

2

-rw-r--r--

src/Java/gtPlusPlus/core/material/ELEMENT.java

17

-rw-r--r--

src/Java/gtPlusPlus/core/material/Material.java

303

-rw-r--r--

src/Java/gtPlusPlus/core/material/MaterialGenerator.java

32

-rw-r--r--

src/Java/gtPlusPlus/core/material/MaterialStack.java

10

-rw-r--r--

src/Java/gtPlusPlus/core/material/ORES.java

84

-rw-r--r--

src/Java/gtPlusPlus/core/material/nuclear/FLUORIDES.java

1

-rw-r--r--

src/Java/gtPlusPlus/core/material/nuclear/NUCLIDE.java

14

-rw-r--r--

src/Java/gtPlusPlus/core/material/state/MaterialState.java

3

-rw-r--r--

src/Java/gtPlusPlus/core/proxy/ClientProxy.java

17

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java

54

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/RECIPES_General.java

10

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java

30

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java

8

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java

8

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java

18

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/recipe/common/CI.java

7

-rw-r--r--

src/Java/gtPlusPlus/core/slots/SlotBlueprint.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java

33

-rw-r--r--

src/Java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java

11

-rw-r--r--

src/Java/gtPlusPlus/core/slots/SlotGtTool.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/slots/SlotGtToolElectric.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java

6

-rw-r--r--

src/Java/gtPlusPlus/core/tileentities/ModTileEntities.java

4

-rw-r--r--

src/Java/gtPlusPlus/core/tileentities/base/TileEntityBase.java

10

-rw-r--r--

src/Java/gtPlusPlus/core/tileentities/general/TileEntityFishTrap.java

12

-rw-r--r--

src/Java/gtPlusPlus/core/tileentities/general/TileEntityInfiniteFluid.java

14

-rw-r--r--

src/Java/gtPlusPlus/core/tileentities/general/TileEntityXpConverter.java

38

-rw-r--r--

src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java

17