Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Commit

Permalink
Merge pull request #2 from hjae78/master
Browse files Browse the repository at this point in the history
update master
  • Loading branch information
htmlcsjs authored Apr 3, 2021
2 parents a57bf9f + 8a4271b commit da83536
Show file tree
Hide file tree
Showing 151 changed files with 71,181 additions and 7,978 deletions.
25 changes: 24 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
mods/
scripts/recipes.zs
*buildOut/*
*client.zip
*client.zip
config/AppliedEnergistics2/CustomRecipes.cfg
config/AppliedEnergistics2/items.csv
config/InvTweaks.cfg
config/jei/jei.cfg
config/jei/worldSettings.cfg
config/jei/itemBlacklist.cfg
config/splash.properties
usercache.json
usernamecache.json
saves/
options.txt
logs/
logcal/
journeymap/
crafttweaker.log
.ReAuth.cfg
.mixin.out/
OpenComputersMod-1.7.5.192-lua52-native.64.dll
OpenComputersMod-1.7.5.192-lua53-native.64.dll
natives/
local/
config/jei/bookmark.ini
config/jei/worldSettings.cfg
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# GREGALITY COMMUNITY PACK
TODO: ADD STUFF

# GREGICALITY COMMUNITY PACK

## Building
You will need to have python3 installed.
To build run `python build/main.py` in command line.
To build run `python build/main.py` in command line.
2 changes: 2 additions & 0 deletions build/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
print("Directory exists, skipping")

shutil.copytree(basePath + "/scripts", basePath + "/buildOut/overrides/scripts")
shutil.copytree(basePath + "/resources", basePath + "/buildOut/overrides/resources")
shutil.copytree(basePath + "/config", basePath + "/buildOut/overrides/config")
shutil.copytree(basePath + "/mods", basePath + "/buildOut/overrides/mods")
shutil.copy(basePath + "/manifest.json", basePath + "/buildOut/manifest.json")
shutil.make_archive("build/client", "zip", basePath + "/buildOut")

Expand Down
2 changes: 0 additions & 2 deletions config/AE2Stuff/readme.txt

This file was deleted.

12 changes: 6 additions & 6 deletions config/AE2WirelessTerminals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

general {
# Should Infinity Booster Card Recipe be disabled? [default: false]
B:DisableBoosterRecipe=false
B:DisableBoosterRecipe=true

# Should Dragons drop Infinity Booster Card? [default: true]
B:DragonDropsBooster=true
B:DragonDropsBooster=false

# Enable Infinity Booster Card [default: true]
B:EnableBooster=true
Expand All @@ -23,10 +23,10 @@ general {
B:EnableControllerChunkLoading=false

# Percentage chance that booster card will drop upon killing an Enderman. (between 1 and 100) [range: 1 ~ 100, default: 5]
I:EndermanBoosterDropChance=5
I:EndermanBoosterDropChance=1

# Will Enderman randomly drop infinity booster cards on death? [default: true]
B:EndermanDropBoosters=true
B:EndermanDropBoosters=false

# Amount of Infinity Energy Consumed every 10 ticks when not in range of a WAP [range: 5 ~ 100, default: 15]
I:InfinityEnergyDrainAmount=15
Expand All @@ -35,13 +35,13 @@ general {
I:InfinityEnergyPerBooster=100

# If true, then simply inserting 1 Infinity Booster Card into the slot, will give limitless infinite range. [default: false]
B:UseOldInfinityMechanic=false
B:UseOldInfinityMechanic=true

# Percentage chance that booster card will drop upon killing a wither. (between 1 and 100) [range: 1 ~ 100, default: 30]
I:WitherBoosterDropChance=30

# Should Withers drop Infinity Booster Card? [default: true]
B:WitherDropsBooster=true
B:WitherDropsBooster=false
}


87 changes: 45 additions & 42 deletions config/AppliedEnergistics2/AppliedEnergistics2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ battery {

client {
# Possible Values: AE, EU, RF
S:PowerUnit=AE
S:PowerUnit=RF

# Possible Values: AUTOSEARCH, AUTOSEARCH_KEEP, MANUAL_SEARCH, MANUAL_SEARCH_KEEP, JEI_AUTOSEARCH, JEI_AUTOSEARCH_KEEP, JEI_MANUAL_SEARCH, JEI_MANUAL_SEARCH_KEEP
S:SEARCH_MODE=AUTOSEARCH
Expand Down Expand Up @@ -90,58 +90,58 @@ craftingcpu {
features {

world {
B:CertusOre=true
B:CertusQuartzWorldGen=true
B:ChargedCertusOre=true
B:ChestLoot=true
B:CertusOre=false
B:CertusQuartzWorldGen=false
B:ChargedCertusOre=false
B:ChestLoot=false

# Blocks that are not used in any essential recipes, also slabs and stairs.
B:DecorativeBlocks=true
B:DecorativeLights=true
B:Flour=true
B:MeteoriteWorldGen=true
B:SkyStoneChests=true
B:SpawnPressesInMeteorites=true
B:Flour=false
B:MeteoriteWorldGen=false
B:SkyStoneChests=false
B:SpawnPressesInMeteorites=false
B:TinyTNT=true
B:VillagerTrading=true
B:VillagerTrading=false
}

machines {
B:Charger=true
B:CrystalGrowthAccelerator=true
B:GrindStone=true
B:Inscriber=true
B:VibrationChamber=true
B:Charger=false
B:CrystalGrowthAccelerator=false
B:GrindStone=false
B:Inscriber=false
B:VibrationChamber=false
}

toolsclassifications {
B:CertusQuartzTools=true
B:NetherQuartzTools=true
B:CertusQuartzTools=false
B:NetherQuartzTools=false
B:PoweredTools=true
}

tools {
B:ChargedStaff=true
B:ChargedStaff=false
B:ColorApplicator=true
B:EntropyManipulator=true
B:MatterCannon=true
B:MeteoriteCompass=true
B:PaintBalls=true
B:QuartzAxe=true
B:QuartzHoe=true
B:QuartzKnife=true
B:QuartzPickaxe=true
B:QuartzSpade=true
B:QuartzSword=true
B:QuartzWrench=true
B:MeteoriteCompass=false
B:PaintBalls=false
B:QuartzAxe=false
B:QuartzHoe=false
B:QuartzKnife=false
B:QuartzPickaxe=false
B:QuartzSpade=false
B:QuartzSword=false
B:QuartzWrench=false
B:WirelessAccessTerminal=true
}

networkfeatures {
B:Channels=true
B:QuantumNetworkBridge=true
B:Security=true
B:SpatialIO=true
B:SpatialIO=false
}

networkbuses {
Expand Down Expand Up @@ -173,7 +173,7 @@ features {
}

portablecell {
B:PortableCell=true
B:PortableCell=false
}

storage {
Expand Down Expand Up @@ -203,28 +203,28 @@ features {
}

p2ptunnels {
B:P2PTunnelEU=true
B:P2PTunnelEU=false
B:P2PTunnelFE=true
B:P2PTunnelFluids=true
B:P2PTunnelItems=true
B:P2PTunnelLight=true
B:P2PTunnelLight=false
B:P2PTunnelME=true
B:P2PTunnelOpenComputers=true
B:P2PTunnelPressure=true
B:P2PTunnelPressure=false
B:P2PTunnelRedstone=true
}

blockfeatures {
B:MassCannonBlockDamage=true
B:TinyTNTBlockDamage=true
B:MassCannonBlockDamage=false
B:TinyTNTBlockDamage=false
}

facades {
B:Facades=true
}

misc {
B:Achievements=true
B:Achievements=false
B:CraftingLog=false
B:Creative=true
B:DebugLogging=false
Expand All @@ -243,7 +243,7 @@ features {
B:EnableDisassemblyCrafting=true
B:EnableFacadeCrafting=true
B:InWorldFluix=true
B:InWorldPurification=true
B:InWorldPurification=false
B:InWorldSingularity=true
B:InterfaceTerminal=true
}
Expand All @@ -257,6 +257,9 @@ features {

# Use CraftingManager to find an alternative recipe, after a pattern rejected an ingredient. Should be enabled to avoid issues, but can have a minor performance impact.
B:CraftingManagerFallback=true

# Use the default AE2 blocking mode that doesn't work on any machines
B:InsaneBlockingMode=true
B:MolecularAssembler=true
B:Patterns=true
}
Expand All @@ -275,7 +278,7 @@ features {
B:Nuggets=true
B:PureCrystals=true
B:QuartzGlass=true
B:Silicon=true
B:Silicon=false
B:SkyStone=true
}

Expand Down Expand Up @@ -352,16 +355,16 @@ grindstone {

modintegration {
S:CraftTweaker=AUTO
S:IndustrialCraft2=AUTO
S:IndustrialCraft2=OFF
S:InventoryTweaks=AUTO
S:JustEnoughItems=AUTO
S:Mekanism=AUTO
S:MineFactoryReloaded=AUTO
S:Mekanism=OFF
S:MineFactoryReloaded=OFF
S:OpenComputers=AUTO
S:Railcraft=AUTO
S:Tesla=AUTO
S:Tesla=OFF
S:TheOneProbe=AUTO
S:Waila=AUTO
S:Waila=OFF
}


Expand Down
2 changes: 1 addition & 1 deletion config/AppliedEnergistics2/CustomRecipes.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Configuration file

cache {
S:digest=0b0db29c899cda6c769f4709a37468ef
S:digest=5a4bdac093a86fe7fa8c3f8e53b571e7

# Caching can save processing time, if there are a lot of items. [default: true]
B:enableCache=true
Expand Down
2 changes: 1 addition & 1 deletion config/AppliedEnergistics2/VersionChecker.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
cache {
# Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24]
I:interval=24
S:lastCheck=1617029745454
S:lastCheck=1617125589162
}


Expand Down
50 changes: 50 additions & 0 deletions config/AppliedEnergistics2/extracells.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Configuration file

integration {
# Enable BuildCraftFuel Integration.
B:"enableBuildCraftAPI|fuels"=true

# Enable BuildCraft Wrench Integration.
B:"enableBuildCraftAPI|tools"=true

# Enable MekanismGas Integration.
B:"enableMekanismAPI|gas"=true

# Enable COFH Hammer Integration.
B:"enablecofhapi|item"=true

# Enable IngameWikiMod Integration.
B:enableigwmod=true

# Enable Just Enough Items Integration.
B:enablejei=true

# Enable mekanism Integration.
B:enablemekanism=true

# Enable opencomputers Integration.
B:enableopencomputers=true

# Enable Thaumatic Energistics Integration.
B:enablethaumicenergistics=true

# Enable waila Integration.
B:enablewaila=true

# Enable AE2 Wireless Crafting Terminal Integration.
B:enablewct=true
}


"storage cells" {
# Should the mount of bytes needed for a new type depend on the cellsize?
B:dynamicTypes=true
}


tooltips {
# Shall the guis shorten large mB values?
B:shortenedBuckets=true
}


Loading

0 comments on commit da83536

Please sign in to comment.