Skip to content

Commit

Permalink
Merge pull request #3993 from EnigmaticaModpacks/develop
Browse files Browse the repository at this point in the history
0.5.22
NielsPilgaard authored Jan 6, 2022
2 parents 32c1b84 + baf3427 commit 01bcfb5
Showing 296 changed files with 16,536 additions and 47,056 deletions.
39 changes: 23 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -3,12 +3,14 @@
/dumps/
/crash-reports/
/.mixin.out/
/overrides/
/logs/
config/forgeendertech/Biomes/
/local/ftbchunks/data
/local/ftbutilities/
/local/ftbultimine/
/llibrary/
/libraries/
/ESM/
/saves/
screenshots/
@@ -157,16 +159,19 @@ config.json
.DS_Store
.DS_Store?

config/rftoolsdim-client.toml
config/clienttweaks-client.toml
automation/ModListCreator-1.2.0.jar
biomeidfixer.temp
config/findme-client.toml
config/PregenConfig.toml
NewWorldBiomeIdFixer.json

automation/ModListCreator-1.2.1.jar
.github_changelog_generator
local/ftbultimine-client.snbt
hidden-players.json
tconplanner/bookmark.dat

config/findme-client.toml
config/PregenConfig.toml
config/rftoolsdim-client.toml
config/clienttweaks-client.toml
config/sounddeviceoptions-client.toml
config/personality-client.toml
config/framedblocks-client.toml
@@ -179,7 +184,6 @@ config/diet-client.toml
config/contentcreatorintegration/contentcreatorintegration-common.toml
config/contentcreatorintegration/contentcreatorintegration.toml
config/contentcreatorintegration/default/constants.json
config/fml.toml
config/storagedrawers-client.toml
config/blue_skies-client.toml
config/dummmmmmy-client.toml
@@ -188,25 +192,28 @@ config/InventoryHUD/curios.json
config/bloodmagic-client.toml
config/jmi-client.toml
config/tconplanner-client.toml
tconplanner/bookmark.dat
config/roadrunner/common.toml
config/roadrunner/client.toml
config/oauth-client.toml
config/jeed-client.toml
config/valhelsia_core-client.toml
local/ftbultimine-client.snbt
config/forge-client.toml
config/configured-client.toml
config/Mekanism/tools-client.toml
config/Mekanism/client.toml
config/powah/energy/generators/thermo_gen.toml
config/powah/energy/generators/solar_panel.toml
config/powah/energy/generators/reactor.toml
config/powah/energy/generators/magmator.toml
config/powah/energy/generators/furnator.toml
config/patchouli-client.toml
config/mininggadgets-common.toml
config/Mekanism/machine-usage.toml
config/Mekanism/machine-storage.toml
config/Mekanism/gear.toml
config/industrialforegoing/machine-resource-production.toml
config/industrialforegoing/machine-misc.toml
config/industrialforegoing/machine-generator.toml
config/industrialforegoing/machine-core.toml
config/industrialforegoing/machine-agriculture-husbandry.toml
config/Mekanism/machine-storage.toml
config/Mekanism/machine-usage.toml
config/mininggadgets-common.toml
config/powah/energy/generators/furnator.toml
config/powah/energy/generators/magmator.toml
config/powah/energy/generators/reactor.toml
config/powah/energy/generators/solar_panel.toml
config/powah/energy/generators/thermo_gen.toml
manifest.json
16 changes: 0 additions & 16 deletions automation/.build.json

This file was deleted.

Loading

0 comments on commit 01bcfb5

Please sign in to comment.