Skip to content

Commit

Permalink
Merge pull request #1757 from NillerMedDild/develop
Browse files Browse the repository at this point in the history
0.4.4
  • Loading branch information
NielsPilgaard authored Mar 21, 2021
2 parents 6c84eda + b1006f7 commit a02e3d1
Show file tree
Hide file tree
Showing 390 changed files with 11,207 additions and 6,947 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -170,3 +170,4 @@ config/itemzoom-client.toml
config/inventoryhud-client.toml
config/ftbchunks-client.toml
config/immersiveengineering-client.toml
config/immersivepetroleum-client.toml
6 changes: 6 additions & 0 deletions building_gadgets_patterns/compact_crafting/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
IMPORTANT: Compact Crafting is a newer mod, and as such the mechanics are still a bit rough around the edges. These gadget patterns attempt to minimize the quirkiness as much as possible. Please follow the steps below to reduce headaches:
1) Start by pasting in the projectors. The template is named projectors_max.txt. This step works like a standard copy paste (see the README in the folder above this for instructions).
2) Select the size compact machine you want, and copy the template into the gadget as you normally would
3) Ensure you have all the materials listed, and paste the structure inside the projection field. The entire structure must be inside the field, and for best results it should be on the ground. No other blocks can be in the field or the craft will not work. Take your time with this step, because the machine walls are currently unbreakable due to a bug!
4) There will be a single missing machine wall block in the structure cube. Fill it with a machine wall block, and then throw the catalyst (flux dust) into the field
5) The miniaturization animation should begin, and you should soon have a compact machine.
36 changes: 36 additions & 0 deletions building_gadgets_patterns/compact_crafting/giant.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"header": {
"version": "2.1.0",
"mc_version": "1.16.5",
"name": "Giant Compact Machine",
"author": "Enigmatica",
"bounding_box": {
"min_x": 0,
"min_y": 0,
"min_z": 0,
"max_x": 6,
"max_y": 6,
"max_z": 6
},
"material_list": {
"root_type": "buildinggadgets:entries",
"root_entry": [
{
"item_type": "buildinggadgets:simple_item",
"count": 1,
"item": {
"id": "minecraft:diamond_block"
}
},
{
"item_type": "buildinggadgets:simple_item",
"count": 217,
"item": {
"id": "compactmachines:wall"
}
}
]
}
},
"body": "H4sIAAAAAAAAAI3VvXLTQBRA4b2/E1xQMUPLK9CmpadO0mQUSyQaLCtjyQPhUXka1tERxK5I4U8ae6UjrZTdlPKueNvMzaaUoptlu1jZTN2hb3b9r+5QvyibEtPczN1V8a/N0JUP23F4brbz0Gyf+n03Xf9odrvTz/5z/Mehjtoemm/zdds3w7hv7x924/b7Kceex8nrmN/lzZ+goqFjYF4MEFQ0dAzMixMIKho6BuZFkKCioWNgXlyAoKKhY2BeXLCgoqFjYF7cIEFFQ8fA/HtDlzsqqGjoGJjrDAj7WAcu+1gPINwP4X4I1ylcp9Av9Av9Qr/QL/QL/UL/2cwKKho6Bub6JAj7WD+VfqVf6Vf6lX6lX+lX+pV+pV/pV/qVfqX/7AkTVDR0DMz1iRT2sQ40+o2jvk6hGfvO91gPaPQb/Ua/0W/0G/1Gv9F/9qQLKho6Bub6Zgj7WAc6/U6/c/+dszj9Tr/T7/Q7/U6/0+/0O/1O/9kbJ6ho6BiY6xsq7GMdGPQH/UF/0B/0B2cN+oP+oD/oD/qD/qA/6D978wUVDR0Dc/1PIYxDRUPHwMR6gmUcKho6BibWoGUcKho6BibWC1jGoaKhY2BiveBlHCoaOgYm1s9kHpJ5SOYhmYdkHpJ5yE3Jp65pu8NVyeY4P42H8n7op7k73L+MU11Hx/qLh/G4b6f6NNcV8na5IafNm3Wz+Xm3XPZp8/bf5s262e/vXgPrUrs/LbX5ZXx++fS5Lqxv1uSr15n99HDsd22/f3xs2sdunq7b4zC83L9Zuv8AN5OqViAIAAA\u003d"
}
36 changes: 36 additions & 0 deletions building_gadgets_patterns/compact_crafting/large.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"header": {
"version": "2.1.0",
"mc_version": "1.16.5",
"name": "Large Compact Machine",
"author": "Enigmatica",
"bounding_box": {
"min_x": 0,
"min_y": 0,
"min_z": 0,
"max_x": 6,
"max_y": 6,
"max_z": 6
},
"material_list": {
"root_type": "buildinggadgets:entries",
"root_entry": [
{
"item_type": "buildinggadgets:simple_item",
"count": 1,
"item": {
"id": "minecraft:redstone_block"
}
},
{
"item_type": "buildinggadgets:simple_item",
"count": 217,
"item": {
"id": "compactmachines:wall"
}
}
]
}
},
"body": "H4sIAAAAAAAAAI3VvXLTQBRA4b2/E1xQUVDyDJRp6amTNBnFEokHy8pI8kB4VJ6GdXQEsStS+JMcr3VWK1mbUt4Vb5u52ZRSdLNsFyubqRt3zX73qxvrP8qmxDQ3c3dV/GvTd+XDduifm+3cN9un3aGbrn80+/3pY/85/mNfR23H5tt8PXbtNA+H7v5hP2y/n3rseZi8Dvpd3vwJKho6BubFAEFFQ8fAvDiAoKKhY2BeBAkqGjoG5sUEBBUNHQPzYsKCioaOgXlxggQVDR0D8+8JXc6ooKKhY2CuKyDsYx247GP9AuF8COdDmKcwT6Ff6Bf6hX6hX+gX+oX+s5UVVDR0DMz1ShD2sb4q/Uq/0q/0K/1Kv9Kv9Cv9Sr/Sr/Qr/Ur/2RUmqGjoGJjrFSnsryrv27J0ZryP9YuMfqPf6Df6jX6j3+g3+o1+o//sShdUNHQMzPXOEPaxDnTm4czD6XeO4vQ7/U6/0+/0O/1Ov9Pv9Dv9Z3ecoKKhY2Cud6iwj3Vg0B/0B/1Bf9AfHDXoD/qD/qA/6A/6g/6g/+zOF1Q0dAzM9ZdCGIeKho6BifUAyzhUNHQMTKxByzhUNHQMTKwTWMahoqFjYGKd8DIOFQ0dAxPra7IOyTok65CsQ7IOyTrkpuRT17TdeFWyOc5Pw1je97tp7sb7l2GqD9KhfuJhOB7aqV7N9RF5u5yQ0+bNutn8vFumfdq8/bd5s27uDnevgfVZezg9a/PL8Pzy6XN9sL55KF+9ruynh+Nu3+4Oj49N+9jN03V77PuX+zfP7j956GmRIQgAAA\u003d\u003d"
}
36 changes: 36 additions & 0 deletions building_gadgets_patterns/compact_crafting/maximum.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"header": {
"version": "2.1.0",
"mc_version": "1.16.5",
"name": "Maximum Compact Machine",
"author": "Enigmatica",
"bounding_box": {
"min_x": 0,
"min_y": 0,
"min_z": 0,
"max_x": 6,
"max_y": 6,
"max_z": 6
},
"material_list": {
"root_type": "buildinggadgets:entries",
"root_entry": [
{
"item_type": "buildinggadgets:simple_item",
"count": 1,
"item": {
"id": "emendatusenigmatica:enderium_block"
}
},
{
"item_type": "buildinggadgets:simple_item",
"count": 217,
"item": {
"id": "compactmachines:wall"
}
}
]
}
},
"body": "H4sIAAAAAAAAAI3VPXKbQBiA4f1+x1GRKgfw5Arp3KZPbbvxYImxmQjwCDSJc9ScJivzkliq4kIPyFrxLgtiU8qH4rtmbjalFN0s28XKZmoPXbPvfrWH+o+yKTHNzdxeFf/W9G35tB37l2Y79832uRva6eZHs9+fPvaf4z+3fTvUjx6nduie+mbuts1NfacOOvYPj/tx+/1UZi/j5HX47/LuT1DR0DEwLwYIKho6BubFAQQVDR0D8yJIUNHQMTAvJiCoaOgYmBcTFlQ0dAzMixMkqGjoGJh/T+hyRgUVDR0Dc10BYR/rwGUf6xcI50M4H8I8hXkK/UK/0C/0C/1Cv9Av9J+trKCioWNgrleCsI/1VelX+pV+pV/pV/qVfqVf6Vf6lX6lX+lX+s+uMEFFQ8fAXK9IYX9Ved+WpTPjfaxfZPQb/Ua/0W/0G/1Gv9Fv9Bv9Z1e6oKKhY2Cud4awj3WgMw9nHk6/cxSn3+l3+p1+p9/pd/qdfqff6T+74wQVDR0Dc71DhX2sA4P+oD/oD/qD/uCoQX/QH/QH/UF/0B/0B/1nd76goqFjYK6/FMI4VDR0DEysB1jGoaKhY2BiDVrGoaKhY2BincAyDhUNHQMT64SXcaho6BiYWF+TdUjWIVmHZB2SdUjWITcln9umPu6uSjbH+Xk8lI99N83t4eF1nOojdayfeByPw26qV3PfDXfLCTlt3q6bzc/7Zdqnzbt/m7frZjfcvwXWp+5weurm1/Hl9fpLfbC+ezxfva3s9eOx2++64emp2T2183SzO/b968O7p/gfcMZ0rSsIAAA\u003d"
}
36 changes: 36 additions & 0 deletions building_gadgets_patterns/compact_crafting/normal.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"header": {
"version": "2.1.0",
"mc_version": "1.16.5",
"name": "Normal Compact Machine",
"author": "Enigmatica",
"bounding_box": {
"min_x": 0,
"min_y": 0,
"min_z": 0,
"max_x": 4,
"max_y": 4,
"max_z": 4
},
"material_list": {
"root_type": "buildinggadgets:entries",
"root_entry": [
{
"item_type": "buildinggadgets:simple_item",
"count": 1,
"item": {
"id": "minecraft:diamond_block"
}
},
{
"item_type": "buildinggadgets:simple_item",
"count": 97,
"item": {
"id": "compactmachines:wall"
}
}
]
}
},
"body": "H4sIAAAAAAAAAI2TPW/bMBBAeR81XA2ZCnTNj+jkNXvmJItBS6wtRB+GJKN1f33o6Km1PVWD3hE68t1RuCKEr8GrOMUihKDFHAcLxZiGOjb1nzTkD6EIX8YpTmkd/Dm2KXwr+/YYy6mN5aHu0rj5FZvmkvaf+7+3eVc5xJ/Tpqpj23fVdtf05fulHDv2o+c9u3D1CFRo0O8SBCo06HcHCFRo0O8EAhUa9LsCBCo06H8LnCsUqNCgLx0Ia5gThbqEugS/4Bf8gl/wC/6bzgUqNOjLzQhrmUvM96P4Fb/iV/yKX/ErfsV/c6MCFRr05caFNcyJht84xfAbfsNv+A2/4b/5UwIVGvTlTwp5UKFBh/mAOQ8qNOgwC+Y8qNCgw/x2+nD6cPpw+vAirA4pVmlYh1U8TYd+CA9tPU5p2J77Mc9hnzN2/amrxnxqnrBXCsjhyxLG329oc/j6L3xZwrp7+ywoj2p3GdXVU388P/7Ig3k10+vPm3rcneqmqrv9Plb7NI2b6tS25+3V6H8ACGiKcmAEAAA\u003d"
}
36 changes: 36 additions & 0 deletions building_gadgets_patterns/compact_crafting/projectors_max.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"header": {
"version": "2.1.0",
"mc_version": "1.16.5",
"name": "Maximum Projection Field",
"author": "Enigmatica",
"bounding_box": {
"min_x": 0,
"min_y": 0,
"min_z": 0,
"max_x": 20,
"max_y": 4,
"max_z": 20
},
"material_list": {
"root_type": "buildinggadgets:entries",
"root_entry": [
{
"item_type": "buildinggadgets:simple_item",
"count": 16,
"item": {
"id": "minecraft:cobblestone"
}
},
{
"item_type": "buildinggadgets:simple_item",
"count": 4,
"item": {
"id": "compactcrafting:field_projector"
}
}
]
}
},
"body": "H4sIAAAAAAAAAL1SsXLDIAyVY5JLGDK5c/sd/ohexzSLTzZKQs4GH+Br06+vMLiXrdcOYeBJSOhJDyTADoTCgBIA1jLZUIL05DT2+oscB0DC2gcMtAXxigPB06ANdQ5Poe5s2/bkgzUU834pIEG+OTuSC5r8FjYn7LQ5c9BO4QJL+efODiN2YWbgeH3S1KtmdPZKXbDu/0SC0IdH8HzQQ3jWxro/CbeDcrRecOUqlU9LFhlXGcu4FyAFLGtOrZYrRfYzwir7GeMgsz8jFxURS6hEOpcLf5FxlbGMKCJvJWFzIVTkeFzk78Ht7wftA7nmZv1FG8sZrZ2M8iUI/pHviTiah8XEz2NqI5oxQSTzsJxqc5wbZglNlHD/I5ZvOI8Fu3uR7Tz5SzvpXrG8Z1RnCr5W0zDcmruH+wYqoLH9WAMAAA\u003d\u003d"
}
36 changes: 36 additions & 0 deletions building_gadgets_patterns/compact_crafting/small.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"header": {
"version": "2.1.0",
"mc_version": "1.16.5",
"name": "Small Compact Machine",
"author": "Enigmatica",
"bounding_box": {
"min_x": 0,
"min_y": 0,
"min_z": 0,
"max_x": 4,
"max_y": 4,
"max_z": 4
},
"material_list": {
"root_type": "buildinggadgets:entries",
"root_entry": [
{
"item_type": "buildinggadgets:simple_item",
"count": 1,
"item": {
"id": "minecraft:redstone_block"
}
},
{
"item_type": "buildinggadgets:simple_item",
"count": 97,
"item": {
"id": "compactmachines:wall"
}
}
]
}
},
"body": "H4sIAAAAAAAAAI2Tu3LbMBAAcY9oFBauUqT0T6RR69617UYDkYjEMR8akppE+XpD5jKRVIUF9zA8YO/AuSKEr8GrOMUihKDFHAcLxZiGOjb1nzTkD6EIX8YpTmkd/Dm2KXwr+/YYy6mN5aHu0rj5FZvmkvaf+7+3eVc5xJ/TZkjVOPVd2u6avny/1GPHfvS8aReuHoEKDfpdgkCFBv3uAIEKDfqdQKBCg35XgECFBv1vgXOFAhUa9KUDYQ1zolCXUJfgF/yCX/ALfsF/07lAhQZ9uRlhLXOJ+X4Uv+JX/Ipf8St+xa/4b25UoEKDvty4sIY50fAbpxh+w2/4Db/hN/w3f0qgQoO+/EkhDyo06DAfMOdBhQYdZsGcBxUadJjfTh9OH04fTh9ehNUhxSoN67CKp+nQD+GhrccpDdtzP+ZB7HPGrj911ZhPzSP2SgE5fFnC+PsNbQ5f/4UvS1h3b58F5VntLrO6euqP58cfeTCvhnr9eVOPu1PdVHW338dqn6ZxU53a9ry9mv0PlK12N2EEAAA\u003d"
}
29 changes: 29 additions & 0 deletions building_gadgets_patterns/compact_crafting/tiny.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"header": {
"version": "2.1.0",
"mc_version": "1.16.5",
"name": "Tiny Compact Machine",
"author": "Enigmatica",
"bounding_box": {
"min_x": 0,
"min_y": 0,
"min_z": 0,
"max_x": 4,
"max_y": 4,
"max_z": 4
},
"material_list": {
"root_type": "buildinggadgets:entries",
"root_entry": [
{
"item_type": "buildinggadgets:simple_item",
"count": 97,
"item": {
"id": "compactmachines:wall"
}
}
]
}
},
"body": "H4sIAAAAAAAAAF2Tu27CQBAAbx9BxEWqfABfkSJt+tRAgw58AkvYRrZRQr4+B4wTgILZg/XO7llbhPAcvIxDLEIIUlzjYKHoU1fFffWTuvxHKMJTP8QhTYN/xjqF101bH+JmqONmVzWpf/+K+/25lh3a3vMDMdx8BCo06A8JAhUa9IcCAhUa9AeBQIUG/aEBgQoN+l+D1w4FKjTo4wTCGeZEoS+hL8Ev+AW/4Bf8gv9ucoEKDfp4M8J5pPK7cYb5AcWreBWv4r27SYEKDfp408IZ5kTDb1Qx/Ibf8Bt+w2/4796QQIUGfXyDQh5UaNBhLnDNgwoNOsyCax5UaNBh/nbmcOZw5nDm8CJMdimWqZuGSTwOu7YLL3XVD6lbndo+L0+bM9btsSn7XLWumgUN5HA+hvF7iTaHi/9wPoZVs7w0lPezOe/n5KM9nGZveSFvFnl6uanZ+ljty6rZbmO5TUP/Xh7r+rS62fdfwYlorxUEAAA\u003d"
}
33 changes: 26 additions & 7 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
### Enigmatica 6 v0.4.3
### Enigmatica 6 v0.4.4

_Using Forge-1.16.5-36.0.45_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.3.md)_
_Using Forge-1.16.5-36.0.46_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.4.md)_

**If you're updating from 0.3.x please read the last 3 changelogs**

**Improvements/Changes**

- Bees: I-C-Bee Honey Bottles output chance increased to 50% from 2%
- Dropoff/quickstack once again ignores the hotbar
- Thermal: Added JEI info about Blitz, Blizz & Basalz
- StorageDrawers: Added JEI info about Framed Drawers (Merlo)
- Create: Rockwool & Quilted Wool can now be used as Windmill Sails
- Curios: Added Goggles support for all Goggles.

**If you're updating from 0.3.x please read the last 3 changelogs**
**Bug Fixes**

-

**Removed Mods**

- CreatePlus: We added our own Curios support

### Enigmatica 6 v0.4.3

_Using Forge-1.16.5-36.0.45_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.4.3.md)_

**If you're updating from 0.3.x please read the last 3 changelogs**

**Improvements/Changes**

Expand All @@ -23,21 +42,21 @@ _Using Forge-1.16.5-36.0.45_ | _[Mod Updates](https://github.com/NillerMedDild/E
- \[Tetra&Pneumaticcraft\] Disenchanting Exploit [\#1506](https://github.com/NillerMedDild/Enigmatica6/issues/1506)
- Blast Furnace Smelt Iron Dust at Half Speed/Half Efficiency [\#1519](https://github.com/NillerMedDild/Enigmatica6/issues/1519)
- Cooking for Blockheads Book Recipe [\#1529](https://github.com/NillerMedDild/Enigmatica6/issues/1529)
- Crashing using Pneumatic helmet with tetra [\#639](https://github.com/NillerMedDild/Enigmatica6/issues/639)
- Crashing using Pneumatic helmet with tetra [\#639](https://github.com/NillerMedDild/Enigmatica6/issues/639)
- Crash when using Occultism machine operator [\#1530](https://github.com/NillerMedDild/Enigmatica6/issues/1530)
- Create crushed ores accidentally hidden in JEI [\#1512](https://github.com/NillerMedDild/Enigmatica6/issues/1512)
- Cutting Board recipe using wrong item [\#1422](https://github.com/NillerMedDild/Enigmatica6/issues/1422)
- Dupe Bug: PNC vacuum Chamber and Quark Ancient Tome [\#1514](https://github.com/NillerMedDild/Enigmatica6/issues/1514)
- Elytra doesn't break properly when worn as a curio [\#1496](https://github.com/NillerMedDild/Enigmatica6/issues/1496)
- Ender cells reset energy levels [\#1445](https://github.com/NillerMedDild/Enigmatica6/issues/1445)
- End Stone smelter has broken GUI [\#1426](https://github.com/NillerMedDild/Enigmatica6/issues/1426)
- IE Arc furnace Recycling recipe wrong [\#654](https://github.com/NillerMedDild/Enigmatica6/issues/654)
- IE Arc furnace Recycling recipe wrong [\#654](https://github.com/NillerMedDild/Enigmatica6/issues/654)
- ImmersiveEngineering: Temporarily removed Jerrycan recipe due to an issue with the Jerrycan
- JustEnoughResources: No more double reloading, should speed up the time it takes to load singleplayer
- JustEnoughResources: No more double reloading, should speed up the time it takes to load singleplayer
- Lootr & Dungeon Crawl Interaction [\#1508](https://github.com/NillerMedDild/Enigmatica6/issues/1508)
- Mob Duplicator no longer spawning mobs [\#1518](https://github.com/NillerMedDild/Enigmatica6/issues/1518)
- Powah: Cleaned up ways to obtain Uranitite, only the valid ones are shown now.
- Remove Natural Spawning of Cockroaches [\#1535](https://github.com/NillerMedDild/Enigmatica6/issues/1535)
- Remove Natural Spawning of Cockroaches [\#1535](https://github.com/NillerMedDild/Enigmatica6/issues/1535)
- Undergarden SMP generation [\#1472](https://github.com/NillerMedDild/Enigmatica6/issues/1472)
- UpdateServerScript: Fixed overrides folder not being moved correctly on Unix based operating systems.

Expand Down
2 changes: 1 addition & 1 deletion config/Mekanism/general.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
#Disables Forge Energy (FE,RF,IF,uF,CF) power integration. Requires world restart (server-side option in SMP).
blacklistForge = false
#Maximum Joules per mB of Steam. Also affects Thermoelectric Boiler.
maxEnergyPerSteam = "2"
maxEnergyPerSteam = "4"
#Conversion multiplier from Forge Energy to Joules (FE * JoulePerForgeEnergy = Joules)
JoulePerForgeEnergy = "2.5000"
#Conversion multiplier from EU to Joules (EU * JoulePerEU = Joules)
Expand Down
2 changes: 1 addition & 1 deletion config/Mekanism/generators.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
[generators.fusion_reactor]
#The fraction of the heat dissipated from the case that is converted to Joules.
#Range: 0.0 ~ 1.0
thermocoupleEfficiency = 0
thermocoupleEfficiency = 0.014
#The fraction fraction of heat from the casing that can be transfered to all sources that are not water. Will impact max heat, heat transfer to thermodynamic conductors, and power generation.
#Range: 0.001 ~ 1.0
casingThermalConductivity = 0.1
Expand Down
Loading

0 comments on commit a02e3d1

Please sign in to comment.