Skip to content

Commit

Permalink
Merge pull request #974 from NillerMedDild/develop
Browse files Browse the repository at this point in the history
0.3.7
  • Loading branch information
NielsPilgaard authored Jan 20, 2021
2 parents bb7f9c6 + 681a728 commit 0dc1d68
Show file tree
Hide file tree
Showing 220 changed files with 17,174 additions and 13,199 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/crash-reports/
/.mixin.out/
/logs/
config/forgeendertech/Biomes/
/local/
/libraries/
/llibrary/
Expand Down Expand Up @@ -154,3 +155,7 @@ config/computercraft-client.toml
config/supplementaries-client.toml
config/artifacts-client.toml
config/occultism-client.toml

# GDLauncher
config.json
/natives/
15 changes: 4 additions & 11 deletions building_gadgets_patterns/mekanism/basic_fusion_reactor.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"header": {
"version": "2-beta",
"version": "2.1.0",
"mc_version": "1.16.4",
"name": "Basic Fusion Reactor",
"author": "Enigmatica",
Expand All @@ -24,7 +24,7 @@
},
{
"item_type": "buildinggadgets:simple_item",
"count": 49,
"count": 36,
"item": {
"id": "mekanismgenerators:fusion_reactor_frame"
}
Expand All @@ -45,20 +45,13 @@
},
{
"item_type": "buildinggadgets:simple_item",
"count": 11,
"count": 24,
"item": {
"id": "mekanismgenerators:reactor_glass"
}
},
{
"item_type": "buildinggadgets:simple_item",
"count": 1,
"item": {
"id": "minecraft:stone"
}
}
]
}
},
"body": "H4sIAAAAAAAAAK1TTW/UMBCdZGaXbYTEhR+wF+DCL9gjSNxACHFoe1m5iZNaJPbKdlDh1+PYL7SHSlsqVtG+scd+b77cEF2QdCqqhoheNMUmpiZob9RofmufHNTQJkQV9Y7ki5o0vZv0D2VNmAZttVfR+XDo52CcPXqt2rQ+9n45SGcpG2q+enfSPhoddrRNt81PTRL9rGnVe3te7+R8fILcyrh/hHGlGkYVwj9wvZqM1a1XfTyE6OxTsl6vvnkkjKSuU/1cO4fjpKI3d/+rjO/Pl7F1Nno3jgv7c0U3vRrDM5p3QXxyQZLAx0WlpvKrqoI1kIHlQEVVXRY11oyLAqwYx4GcMf0J9oFV/jJthRMVHBklY718GaWGn+EHVgIeIAPvIyZEXJCBsm5VBSVj3q2hV/yMNaNEAt6Mm0W3hm7hlb+6DN21Aoz8GPkxQmDoMfJj5MfQYeTH0Fl5Bf0S9EvQL0H2CbdLvwT9ymuui1+AqV+Cfgn6JdCThra3WnXaL9M2x1vn6eXnOervRvejsUPy37jZdiHdSa/yqoS/mJerqe6uSzKLeXVvXq6msdc53DS/dpnf1x9UMO3+Ux7Z/bcysmlYHzyKXa7i/mY2Y5eiGFQ36BgO3TxNv44P3s4fa8QT13AFAAA\u003d"
"body": "H4sIAAAAAAAAALVTTW/UMBAde2ZX24gfsRfgwpFTj3AGceDQ9rJyN97UIolXtoNafj3+eBE9VOqCRBTlzWjsN/P8nI7oiqQ3yXREtO1aTExdtMGZ0f2yIReoo01MJtkdyVczWXo/2R9mdnEa7GyDST7E69MSnZ8PwZpjzg+nUBbSxZT7FyhXrmE0MV7A1VH3LfizDcnZuKNt3u1+WtqczBgtrZ3evT782Yf0F7O/fYExj2zzKfjjEg+TScE9/rsASWH5H/Nf1O7D6+2Ofk7Bj2NhvyI++yi5y6fSSlN7lKpf0qrlDGwLFCmgBjI2ClAx6oz9QC2o49UVcx1YqCuPwhLdUDTqjDpQSVukBTzANqlqxdanIkOBIF9HkIq1qtGv1Rk542ikoJS+GTelb81ZwCvrCTVJjbR+GPoY+hj6GP0Y+hj6GPoY+hj6GOIEPgl8EvgkUC/wSeCTwCeBTwKfBD4JfBL4JB1tH6zpbShXbUkPPtCbL0uy3509jW4ecv3eL3Mf857Jzbdt/BLerKF5vGtiSnj7J7xZQzff1XHz7Z3L7d1+9uen/cd8LZ/9A7t6bvv7xY197juYfrApXvfLND0dnv0qvwGfJliCHwUAAA\u003d\u003d"
}
30 changes: 25 additions & 5 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
### Enigmatica 6 v0.3.7

_Using Forge-1.16.4-35.1.37_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.3.7.txt)_

**New Mods!**

- **Improvements/Changes**

- Worldgen: Stopped Thermal Bituminous sands from generating
- Disabled Quark/Thermal Carrot, Potato and Beetroot crates, replaced by the new Farmer's Delight variants.
- Apotheosis: Nerfed Apotheosis spawners:
- Max Spawn Count (Fermented Spider Eyes modifier) reduced to 5, down from 20
- The minimum delay Sugar can set a Spawner to is now 5 seconds
- Disabled the Clock (maximum delay modifier)
- Max nearby entities, reduced to max 10 down from max 40

**Bug Fixes**

- Disabled JAOPCA's Ender/Ender Pearl/End Stone Storage Blocks

### Enigmatica 6 v0.3.6

_Using Forge-1.16.4-35.1.36_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.3.6.txt)_
Expand All @@ -6,19 +26,19 @@ _Using Forge-1.16.4-35.1.36_ | _[Mod Updates](https://github.com/NillerMedDild/E

**New Mod!**

- FerriteCore
- FerriteCore

**Improvements**

- Added missing secondary outputs to Immersive Engineering and Thermal Ore Processing [\#745](https://github.com/NillerMedDild/Enigmatica6/pull/745) ([MuteTiefling](https://github.com/MuteTiefling))
- Additional Apiary Glass Types [\#871](https://github.com/NillerMedDild/Enigmatica6/issues/871)
- \[ImgBot\] Optimize images [\#852](https://github.com/NillerMedDild/Enigmatica6/pull/852) ([imgbot[bot]](https://github.com/apps/imgbot))
- Bee Update - Higher output, higher time in hive [\#832](https://github.com/NillerMedDild/Enigmatica6/pull/832) ([Ridanisaurus](https://github.com/Ridanisaurus))
- Bee Update - Higher output, higher time in hive [\#832](https://github.com/NillerMedDild/Enigmatica6/pull/832) ([Ridanisaurus](https://github.com/Ridanisaurus))
- Create Ore Processing - Lead [\#838](https://github.com/NillerMedDild/Enigmatica6/pull/838) ([MuteTiefling](https://github.com/MuteTiefling))
- Fix for Create Processing [\#748](https://github.com/NillerMedDild/Enigmatica6/pull/748) ([MuteTiefling](https://github.com/MuteTiefling))
- FTB Chunks: Default max chunk loaded claimed chunks is now 10, down from 25.
- FTB Chunks: Offline chunkloading is now off by default, but old worlds/servers will still have it on. See above for instructions if you wish to change it.
- Implementation of Supplementaries [\#778](https://github.com/NillerMedDild/Enigmatica6/pull/778) ([kil0byt3](https://github.com/kil0byt3))
- Implementation of Supplementaries [\#778](https://github.com/NillerMedDild/Enigmatica6/pull/778) ([kil0byt3](https://github.com/kil0byt3))
- Lost Trinkets: There is now a 30 minute cooldown between being able to obtain a Lost Trinket.
- Lost Trinkets: The following Trinkets can no longer be randomly obtained:
Note: There will most likely be added a way to obtain some of these in the future
Expand Down Expand Up @@ -46,7 +66,7 @@ _Using Forge-1.16.4-35.1.36_ | _[Mod Updates](https://github.com/NillerMedDild/E
- Aquaculture Fishing Loot was empty [\#886](https://github.com/NillerMedDild/Enigmatica6/issues/886)
- Ars Nouveau Loot fix [\#762](https://github.com/NillerMedDild/Enigmatica6/pull/762) ([MuteTiefling](https://github.com/MuteTiefling))
- \[0.3.4\] BloodMagic's Updated Book \(Sanguine Sanctorum\) [\#823](https://github.com/NillerMedDild/Enigmatica6/issues/823) [\#842](https://github.com/NillerMedDild/Enigmatica6/pull/842) ([MuteTiefling](https://github.com/MuteTiefling))
- \[Client Crash\] Latest Create \(v0.3c\) has an NPE for some users \(not all\) [\#810](https://github.com/NillerMedDild/Enigmatica6/issues/810)
- \[Client Crash\] Latest Create \(v0.3c\) has an NPE for some users \(not all\) [\#810](https://github.com/NillerMedDild/Enigmatica6/issues/810)
- \[Server Crash\]\[Ars Noveau\] Using cut spell against ghast's fireball causes ClassCastException [\#819](https://github.com/NillerMedDild/Enigmatica6/issues/819)
- \[Suggestion\] Quest condense/cleanup [\#840](https://github.com/NillerMedDild/Enigmatica6/issues/840)
- Bug: Tha Ghost Trinket not-functional [\#784](https://github.com/NillerMedDild/Enigmatica6/issues/784)
Expand Down Expand Up @@ -75,7 +95,7 @@ _Using Forge-1.16.4-35.1.36_ | _[Mod Updates](https://github.com/NillerMedDild/E
- Sophisticated backpacks can't pull from slot 1 in toolbar [\#834](https://github.com/NillerMedDild/Enigmatica6/issues/834)
- Storage Drawers can no longer be picked up with Cardboard Boxes from Mekanism, as they already retain their inventory when broken.
- Sulfur Conflict [\#879](https://github.com/NillerMedDild/Enigmatica6/pull/879) ([MuteTiefling](https://github.com/MuteTiefling))
- Tetra quest tree is incorrect. [\#831](https://github.com/NillerMedDild/Enigmatica6/issues/831)
- Tetra quest tree is incorrect. [\#831](https://github.com/NillerMedDild/Enigmatica6/issues/831)
- Unable to craft Industrial Foregoing Ore Laser Drill [\#648](https://github.com/NillerMedDild/Enigmatica6/issues/648)

### Enigmatica 6 v0.3.5
Expand Down
48 changes: 24 additions & 24 deletions config/Mekanism/tools.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#Attack damage modifier of steel swords.
steelSwordDamage = 3
#Attack damage modifier of steel hoes.
steelHoeDamage = -4
steelHoeDamage = -1
#Attack speed of steel pickaxes.
steelPickaxeAtkSpeed = -2.799999952316284
#Maximum durability of steel tools.
Expand All @@ -50,7 +50,7 @@
#Range: > 0
steelPaxelEnchantability = 14
#Efficiency of steel tools.
steelEfficiency = 14.0
steelEfficiency = 8.0
#Base armor knockback resistance value of steel armor.
#Range: 0.0 ~ 3.4028234663852886E38
steelKnockbackResistance = 0.0
Expand All @@ -77,7 +77,7 @@
#Range: > 1
steelChestplateDurability = 640
#Efficiency of steel paxels.
steelPaxelEfficiency = 18.0
steelPaxelEfficiency = 10.0
#Protection value of steel helmets.
#Range: > 0
steelHelmetArmor = 3
Expand Down Expand Up @@ -133,13 +133,13 @@
refined_glowstoneHelmetArmor = 3
#Maximum durability of refined_glowstone tools.
#Range: > 1
refined_glowstoneToolMaxUses = 450
refined_glowstoneToolMaxUses = 250
#Attack damage modifier of refined_glowstone hoes.
refined_glowstoneHoeDamage = -5
refined_glowstoneHoeDamage = -1
#Efficiency of refined_glowstone paxels.
refined_glowstonePaxelEfficiency = 18.0
refined_glowstonePaxelEfficiency = 14.0
#Efficiency of refined_glowstone tools.
refined_glowstoneEfficiency = 14.0
refined_glowstoneEfficiency = 11.0
#Harvest level of refined_glowstone paxels.
#Range: > 0
refined_glowstonePaxelHarvestLevel = 3
Expand Down Expand Up @@ -245,7 +245,7 @@
#Range: > 1
lapis_lazuliPaxelMaxUses = 250
#Attack damage modifier of lapis_lazuli hoes.
lapis_lazuliHoeDamage = -2
lapis_lazuliHoeDamage = -1
#Harvest level of lapis_lazuli tools.
#Range: > 0
lapis_lazuliHarvestLevel = 2
Expand Down Expand Up @@ -274,9 +274,9 @@
#Range: > 0
osmiumChestplateArmor = 5
#Efficiency of osmium paxels.
osmiumPaxelEfficiency = 12.0
osmiumPaxelEfficiency = 9.0
#Efficiency of osmium tools.
osmiumEfficiency = 10.0
osmiumEfficiency = 6.5
#Attack speed of osmium pickaxes.
osmiumPickaxeAtkSpeed = -2.799999952316284
#Maximum durability of osmium tools.
Expand All @@ -294,7 +294,7 @@
#Attack speed of osmium shovels.
osmiumShovelAtkSpeed = -3.0
#Attack damage modifier of osmium hoes.
osmiumHoeDamage = -4
osmiumHoeDamage = -1
#Base armor knockback resistance value of osmium armor.
#Range: 0.0 ~ 3.4028234663852886E38
osmiumKnockbackResistance = 0.0
Expand Down Expand Up @@ -358,20 +358,20 @@
[tools.refined_obsidian]
#Protection value of refined_obsidian chestplates.
#Range: > 0
refined_obsidianChestplateArmor = 12
refined_obsidianChestplateArmor = 9
#Attack damage modifier of refined_obsidian axes.
#Range: 0.0 ~ 3.4028234663852886E38
refined_obsidianAxeDamage = 1.5
refined_obsidianAxeDamage = 5.0
#Attack speed of refined_obsidian pickaxes.
refined_obsidianPickaxeAtkSpeed = -2.799999952316284
#Harvest level of refined_obsidian paxels.
#Range: > 0
refined_obsidianPaxelHarvestLevel = 3
#Base armor toughness value of refined_obsidian armor.
#Range: 0.0 ~ 3.4028234663852886E38
refined_obsidianToughness = 4.0
refined_obsidianToughness = 3.0
#Attack speed of refined_obsidian hoes.
refined_obsidianHoeAtkSpeed = 7.0
refined_obsidianHoeAtkSpeed = 6.0
#Base attack damage of refined_obsidian items.
#Range: 0.0 ~ 3.4028234663852886E38
refined_obsidianAttackDamage = 5.0
Expand All @@ -397,14 +397,14 @@
#Range: 0.0 ~ 3.4028234663852886E38
refined_obsidianShovelDamage = 1.0
#Attack damage modifier of refined_obsidian hoes.
refined_obsidianHoeDamage = -10
refined_obsidianHoeDamage = -1
#Maximum durability of refined_obsidian boots.
#Range: > 1
refined_obsidianBootDurability = 650
#Efficiency of refined_obsidian paxels.
refined_obsidianPaxelEfficiency = 25.0
refined_obsidianPaxelEfficiency = 13.0
#Efficiency of refined_obsidian tools.
refined_obsidianEfficiency = 20.0
refined_obsidianEfficiency = 10
#Maximum durability of refined_obsidian tools.
#Range: > 1
refined_obsidianToolMaxUses = 2500
Expand All @@ -426,15 +426,15 @@
refined_obsidianPaxelAtkSpeed = -2.4000000953674316
#Protection value of refined_obsidian boots.
#Range: > 0
refined_obsidianBootArmor = 5
refined_obsidianBootArmor = 4
#Protection value of refined_obsidian helmets.
#Range: > 0
refined_obsidianHelmetArmor = 5
refined_obsidianHelmetArmor = 4
#Attack speed of refined_obsidian shovels.
refined_obsidianShovelAtkSpeed = -3.0
#Protection value of refined_obsidian leggings.
#Range: > 0
refined_obsidianLeggingArmor = 8
refined_obsidianLeggingArmor = 7
#Maximum durability of refined_obsidian helmets.
#Range: > 1
refined_obsidianHelmetDurability = 550
Expand Down Expand Up @@ -605,7 +605,7 @@
#Range: 0.0 ~ 3.4028234663852886E38
bronzeKnockbackResistance = 0.0
#Efficiency of bronze tools.
bronzeEfficiency = 14.0
bronzeEfficiency = 7.0
#Natural enchantability factor of bronze items.
#Range: > 0
bronzeEnchantability = 10
Expand Down Expand Up @@ -634,12 +634,12 @@
#Range: 0.0 ~ 3.4028234663852886E38
bronzeShovelDamage = 0.5
#Attack damage modifier of bronze hoes.
bronzeHoeDamage = -6
bronzeHoeDamage = -1
#Attack speed of bronze paxels.
bronzePaxelAtkSpeed = -2.4000000953674316
#Attack damage modifier of bronze paxels.
#Range: 0.0 ~ 3.4028234663852886E38
bronzePaxelDamage = 3.0
#Efficiency of bronze paxels.
bronzePaxelEfficiency = 16.0
bronzePaxelEfficiency = 9.0

1 change: 1 addition & 0 deletions config/adhooks-client.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions config/adhooks-common.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

26 changes: 26 additions & 0 deletions config/adhooks/hooks/prototype.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Configuration file

prototype_hook {
# Defines interation with non-playable characters. [default: true]
B:affectsNPCs=true

# Defines interation with players. [default: true]
B:affectsPlayers=true

# If true, you can hook any block regardless of its material and hardness. [default: false]
B:canHookAnyBlock=false

# Defines how much damage it will deal to entity on hit. [range: 0.0 ~ 100.0, default: 0.0]
S:damage=0.0

# Set to 'false' if you don't need this unit. [default: true]
B:enabled=true

# Defines how long it can be under fire influence (in seconds). [range: 0.0 ~ 60.0, default: 0.0]
S:resistance=0.0

# Defines how heavy duty it can withstand. [range: 0.0 ~ 20.0, default: 0.0]
S:strength=0.0
}


26 changes: 26 additions & 0 deletions config/adhooks/hooks/pudge.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Configuration file

pudge_hook {
# Defines interation with non-playable characters. [default: true]
B:affectsNPCs=true

# Defines interation with players. [default: true]
B:affectsPlayers=true

# If true, you can hook any block regardless of its material and hardness. [default: false]
B:canHookAnyBlock=false

# Defines how much damage it will deal to entity on hit. [range: 0.0 ~ 100.0, default: 0.0]
S:damage=0.0

# Set to 'false' if you don't need this unit. [default: true]
B:enabled=true

# Defines how long it can be under fire influence (in seconds). [range: 0.0 ~ 60.0, default: 10.0]
S:resistance=10.0

# Defines how heavy duty it can withstand. [range: 0.0 ~ 20.0, default: 10.0]
S:strength=10.0
}


26 changes: 26 additions & 0 deletions config/adhooks/hooks/spear.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Configuration file

spear_hook {
# Defines interation with non-playable characters. [default: true]
B:affectsNPCs=true

# Defines interation with players. [default: true]
B:affectsPlayers=true

# If true, you can hook any block regardless of its material and hardness. [default: false]
B:canHookAnyBlock=false

# Defines how much damage it will deal to entity on hit. [range: 0.0 ~ 100.0, default: 2.0]
S:damage=2.0

# Set to 'false' if you don't need this unit. [default: true]
B:enabled=true

# Defines how long it can be under fire influence (in seconds). [range: 0.0 ~ 60.0, default: 5.0]
S:resistance=5.0

# Defines how heavy duty it can withstand. [range: 0.0 ~ 20.0, default: 5.0]
S:strength=5.0
}


26 changes: 26 additions & 0 deletions config/adhooks/hooks/web.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Configuration file

web_hook {
# Defines interation with non-playable characters. [default: true]
B:affectsNPCs=true

# Defines interation with players. [default: true]
B:affectsPlayers=true

# If true, you can hook any block regardless of its material and hardness. [default: false]
B:canHookAnyBlock=false

# Defines how much damage it will deal to entity on hit. [range: 0.0 ~ 100.0, default: 0.0]
S:damage=0.0

# Set to 'false' if you don't need this unit. [default: true]
B:enabled=true

# Defines how long it can be under fire influence (in seconds). [range: 0.0 ~ 60.0, default: 2.0]
S:resistance=2.0

# Defines how heavy duty it can withstand. [range: 0.0 ~ 20.0, default: 2.0]
S:strength=2.0
}


Loading

0 comments on commit 0dc1d68

Please sign in to comment.