Skip to content

Commit

Permalink
Merge pull request #1590 from AllTheMods/bug-fixes
Browse files Browse the repository at this point in the history
Bug fixes
  • Loading branch information
jeremiahwinsley authored Oct 18, 2022
2 parents 76f8b0e + 52fa3e8 commit cf56617
Show file tree
Hide file tree
Showing 8 changed files with 210 additions and 165 deletions.
40 changes: 32 additions & 8 deletions changelogs/0.4.33.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,19 @@

### Mod Additions
- modonomicon-1.18.2-1.4.0.jar
- showcaseitem-1.18.2-1.0.jar
- TravelAnchors-1.18.2-3.3.jar
### Mod Updates
- AdditionalEnchantedMiner-1.18.2-18.16.jar
- AI-Improvements-1.18.2-0.5.2.jar
- allthemodium-1.9.6-1.18.2-40.1.51.jar
- allthetweaks-1.9.9.6-1.18.2-40.1.60.jar
- Apotheosis-1.18.2-5.7.0.jar
- appliedenergistics2-forge-11.6.1-beta.jar
- archers_paradox-1.18.2-3.0.0.8.jar
- ars_nouveau-1.18.2-2.7.9.jar
- BambooEverything-forge-1.3.3-build.34+mc1.18.2.jar
- BetterF3-3.0.0-Forge-1.18.2.jar
- cc-tweaked-1.18.2-1.100.10.jar
- chipped-2.0.0-forge.jar
- cofh_core-1.18.2-9.0.0.24.jar
Expand All @@ -18,10 +24,12 @@
- CosmeticArmorReworked-1.18.2-v2a.jar
- create-1.18.2-0.5.0.e.jar
- deepresonance-3.0.15.jar
- durabilitytooltip-1.1.4-forge-mc1.18.jar
- elementalcraft-1.18.2-4.4.28.jar
- ensorcellation-1.18.2-3.0.0.10.jar
- EvilCraft-1.18.2-1.2.10.jar
- FarmersDelight-1.18.2-1.2.0.jar
- FastWorkbench-1.18.2-6.1.1.jar
- FramedBlocks-5.8.0.jar
- ftb-ultimine-forge-1802.3.3-build.67.jar
- HostileNeuralNetworks-1.18.2-3.2.2.jar
Expand All @@ -31,23 +39,28 @@
- IntegratedTerminals-1.18.2-1.4.0.jar
- IntegratedTunnels-1.18.2-1.8.15.jar
- ironchests-2.0.4-forge.jar
- ironfurnaces-1.18.2-3.3.2.jar
- item-filters-forge-1802.2.8-build.40.jar
- jei-1.18.2-9.7.2.266.jar
- kubejs-forge-1802.5.5-build.550.jar
- lazierae2-1.18.2-3.1.3.jar
- lazierae2-1.18.2-3.1.4.jar
- LightingWand-1.18.2-forge-4.1.1.jar
- lostcities-1.18-5.3.11.jar
- lostcities-1.18-5.3.12.jar
- mahoutsukai-1.18.2-v1.34.35.jar
- mcjtylib-1.18-6.0.17.jar
- mcw-bridges-2.0.5-mc1.18.2forge.jar
- MEGACells-1.4.0-1.18.2.jar
- mcw-roofs-2.2.1-mc1.18.2-forge.jar
- MEGACells-1.4.2-1.18.2.jar
- minecolonies-1.18.2-1.0.1048-BETA.jar
- mob_grinding_utils-1.18.2-0.4.46.jar
- modonomicon-1.18.2-1.4.0.jar
- MysticalAgriculture-1.18.2-5.1.2.jar
- occultism-1.18.2-1.41.3.jar
- Oh_The_Biomes_You'll_Go-forge-1.18.2-1.4.5.jar
- occultism-1.18.2-1.42.1.jar
- Oh_The_Biomes_You'll_Go-forge-1.18.2-1.4.6.jar
- omgourd-1.18.2-3.0.0.7.jar
- Placebo-1.18.2-6.6.5.jar
- pneumaticcraft-repressurized-1.18.2-3.4.3-8.jar
- polymorph-forge-1.18.2-0.45.jar
- potionsmaster-0.5.9-1.18.2-40.0.2.jar
- Powah-3.0.5-beta.jar
- productivebees-1.18.2-0.9.1.6.jar
- reliquary-1.18.2-2.0.19.1161.jar
Expand All @@ -58,12 +71,13 @@
- rftoolsutility-1.18-4.0.19.jar
- rhino-forge-1802.2.1-build.240.jar
- RSInfinityBooster-1.18.2-2.1+20.jar
- silent-gear-1.18.2-2.10.15.jar
- silent-gear-1.18.2-2.10.16.jar
- simplylight-1.18.2-1.4.5-build.43.jar
- sophisticatedbackpacks-1.18.2-3.18.29.718.jar
- sophisticatedcore-1.18.2-0.5.13.132.jar
- sophisticatedstorage-1.18.2-0.5.17.152.jar
- supplementaries-1.18.2-1.5.9.jar
- structure_gel-1.18.2-2.4.7.jar
- supplementaries-1.18.2-1.5.10.jar
- TConstruct-1.18.2-3.5.2.40.jar
- thermal_cultivation-1.18.2-9.0.0.13.jar
- thermal_expansion-1.18.2-9.0.0.15.jar
Expand All @@ -72,6 +86,7 @@
- thermal_locomotion-1.18.2-9.0.0.10.jar
- tombstone-7.5.4-1.18.2.jar
- twilightforest-1.18.2-4.1.1423-universal.jar
- WitherSkeletonTweaks-1.18.2-7.1.3.jar
- xnet-1.18-4.0.7.jar

### Other Changes
Expand All @@ -80,3 +95,12 @@
- Add alternate enderium dust recipe
- Fix silicon unification (#1573)
- Fix Mekanism enrichment recipes for raw ore blocks (#1572)
- Disable Miner's Fervor enchantment (#1538)
- Add quests for new MEGA Cells (thanks to 90)
- Add Thermal mobs to Hostile Neural Networks
- Fix Pepto Beesmol quests (#1437, #1526)
- Blacklist Source Receptacles from the eternal stella (#1425)
- Disable moving waystones in place (#1516)
- Fixed Latex, pink slime, liquid meat, and ethergas tank owner in IF quests
- Reduce ATM star ingredients costs
- Additional unification fixes
2 changes: 1 addition & 1 deletion config/MouseTweaks.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RMBTweak=1
RMBTweak=0
LMBTweakWithItem=1
LMBTweakWithoutItem=1
WheelTweak=0
Expand Down
35 changes: 35 additions & 0 deletions config/apotheosis/enchantments.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# File Specification: https://gist.github.com/Shadows-of-Fire/88ac714a758636c57a52e32ace5474c1

# Apotheosis Enchantment Information

# This file contains configurable data for each enchantment.
# The names of each category correspond to the registry names of every loaded enchantment.

"apotheosis:miners_fervor" {
# If this enchantment is obtainable via enchanting and enchanted loot items. [default: true]
B:Discoverable=false

# If enchanted books of this enchantment are available via loot sources. [default: true]
B:Lootable=false

# The max level of this enchantment - originally 5. [range: 1 ~ 127, default: 5]
I:"Max Level"=5

# The max level of this enchantment available from loot sources. [range: 1 ~ 127, default: 5]
I:"Max Loot Level"=5

# A function to determine the max enchanting power. The variable "x" is level. See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
S:"Max Power Function"=

# A function to determine the min enchanting power. [default: ]
S:"Min Power Function"=

# The rarity of this enchantment. Valid values are COMMON, UNCOMMON, RARE, and VERY_RARE. [default: RARE]
S:Rarity=RARE

# If enchanted books of this enchantment are available via villager trades. [default: true]
B:Tradeable=false

# If this enchantment is only available by loot sources. [default: false]
B:Treasure=false
}
132 changes: 131 additions & 1 deletion config/inventoryprofilesnext/integrationHints/integrateddynamics.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"ignore": true
},
"org.cyclops.integratedterminals.client.gui.container.ContainerScreenTerminalStorage": {
"ignore": true,
"buttonHints": {
"MOVE_TO_CONTAINER": {
"horizontalOffset": 20
Expand Down Expand Up @@ -37,5 +38,134 @@
},
"org.cyclops.integratedcrafting.inventory.container.ContainerPartInterfaceCrafting": {
"ignore": true
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenCoalGenerator": {
"playerSideOnly": true,
"buttonHints": {
"SORT": {
"bottom": 39
},
"SORT_COLUMNS": {
"bottom": 39
},
"SORT_ROWS": {
"bottom": 39
}
}
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenLogicProgrammerPortable": {
"playerSideOnly": true,
"buttonHints": {
"SORT": {
"horizontalOffset": -41,
"bottom": 16
},
"SORT_COLUMNS": {
"horizontalOffset": -29,
"bottom": 4
},
"SORT_ROWS": {
"horizontalOffset": -17,
"bottom": -8
}
}
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenMaterializer": {
"playerSideOnly": true
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenProxy": {
"playerSideOnly": true
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenMechanicalSqueezer": {
"playerSideOnly": true,
"buttonHints": {
"SORT": {
"horizontalOffset": -41,
"bottom": -14
},
"SORT_COLUMNS": {
"horizontalOffset": -29,
"bottom": -27
},
"SORT_ROWS": {
"horizontalOffset": -17,
"bottom": -40
}
}
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenMechanicalDryingBasin": {
"playerSideOnly": true,
"buttonHints": {
"SORT": {
"horizontalOffset": -41,
"bottom": -14
},
"SORT_COLUMNS": {
"horizontalOffset": -29,
"bottom": -27
},
"SORT_ROWS": {
"horizontalOffset": -17,
"bottom": -40
}
}
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenDelay": {
"playerSideOnly": true,
"buttonHints": {
"SORT": {
"horizontalOffset": -42,
"bottom": -11
},
"SORT_COLUMNS": {
"horizontalOffset": -30,
"bottom": -24
},
"SORT_ROWS": {
"horizontalOffset": -18,
"bottom": -37
}
}
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenLabeller": {
"playerSideOnly": true,
"buttonHints": {
"SORT": {
"horizontalOffset": -42,
"bottom": -13
},
"SORT_COLUMNS": {
"horizontalOffset": -30,
"bottom": -26
},
"SORT_ROWS": {
"horizontalOffset": -18,
"bottom": -39
},
"SHOW_EDITOR": {
"horizontalOffset": -1,
"top": -2
}
}
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenLogicProgrammer": {
"playerSideOnly": true,
"buttonHints": {
"SORT": {
"horizontalOffset": -42,
"bottom": 17
},
"SORT_COLUMNS": {
"horizontalOffset": -30,
"bottom": 4
},
"SORT_ROWS": {
"horizontalOffset": -18,
"bottom": -9
}
}
},
"org.cyclops.integrateddynamics.client.gui.container.ContainerScreenVariablestore": {
"playerSideOnly": true
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,8 @@
},
"dev.latvian.mods.itemfilters.gui.InventoryFilterScreen": {
"ignore": true
},
"com.hrznstudio.titanium.client.screen.container.BasicAddonScreen": {
"ignore": true
}
}
7 changes: 7 additions & 0 deletions config/ironfurnaces-client.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#Update Checker Settings
[updates]

[updates.check_updates]
# true = check for updates, false = don't check for updates.
# Default: true.
updates = false
Loading

0 comments on commit cf56617

Please sign in to comment.