Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Oct 13, 2020
2 parents 385348d + bcab410 commit 639a0e7
Show file tree
Hide file tree
Showing 206 changed files with 13,790 additions and 13,432 deletions.
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
**Modpack version**
Input version here

**Issue**
Input short description of the issue here

**Logs**
**Modpack version**
Input modpack version here

**Issue**
Input short description of the issue here

**Logs**
Input pastebin link to crash-report or latest log, if applicable
67 changes: 34 additions & 33 deletions .github/move.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
# Configuration for move-issues - https://github.com/dessant/move-issues

# Delete the command comment when it contains no other content
deleteCommand: true

# Close the source issue after moving
closeSourceIssue: false

# Lock the source issue after moving
lockSourceIssue: false

# Mention issue and comment authors
mentionAuthors: false

# Preserve mentions in the issue content
keepContentMentions: false

# Move labels that also exist on the target repository
moveLabels: true

# Set custom aliases for targets
aliases:
e2: enigmatica2
e2l: enigmatica2light
e2e: enigmatica2expert
e2es: enigmatica2expertskyblock
e3: enigmatica3
e4: enigmatica4
e5: enigmatica5
s: scientia

# Repository to extend settings from
_extends: .github
# Configuration for move-issues - https://github.com/dessant/move-issues

# Delete the command comment when it contains no other content
deleteCommand: true

# Close the source issue after moving
closeSourceIssue: false

# Lock the source issue after moving
lockSourceIssue: false

# Mention issue and comment authors
mentionAuthors: false

# Preserve mentions in the issue content
keepContentMentions: false

# Move labels that also exist on the target repository
moveLabels: true

# Set custom aliases for targets
aliases:
e2: enigmatica2
e2l: enigmatica2light
e2e: enigmatica2expert
e2es: enigmatica2expertskyblock
e3: enigmatica3
e4: enigmatica4
e5: enigmatica5
e6: enigmatica6
s: scientia

# Repository to extend settings from
_extends: .github
26 changes: 13 additions & 13 deletions .github/no-response.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Configuration for probot-no-response - https://github.com/probot/no-response

# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 7
# Label requiring a response
responseRequiredLabel: "Status: Awaiting Information"
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information from the original author. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further.
# Configuration for probot-no-response - https://github.com/probot/no-response

# Number of days of inactivity before an Issue is closed for lack of response
daysUntilClose: 7
# Label requiring a response
responseRequiredLabel: "Status: Awaiting Information"
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
closeComment: >
This issue has been automatically closed because there has been no response
to our request for more information from the original author. With only the
information that is currently in the issue, we don't have enough information
to take action. Please reach out if you have or find the answers we need so
that we can investigate further.
46 changes: 23 additions & 23 deletions .github/support.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# Configuration for Support Requests - https://github.com/dessant/support-requests

# Label used to mark issues as support requests
supportLabel: "Support"

# Comment to post on issues marked as support requests, `{issue-author}` is an
# optional placeholder. Set to `false` to disable
supportComment: >
We use the issue tracker exclusively for bug reports, development and feature requests.
However, this issue appears to be a support request.
Please use the [support channel on our Discord](https://discord.gg/kZ7RdrD) to get help.
# Close issues marked as support requests
close: true

# Lock issues marked as support requests
lock: false

# Assign `off-topic` as the reason for locking. Set to `false` to disable
setLockReason: false

# Repository to extend settings from
# Configuration for Support Requests - https://github.com/dessant/support-requests

# Label used to mark issues as support requests
supportLabel: "Support"

# Comment to post on issues marked as support requests, `{issue-author}` is an
# optional placeholder. Set to `false` to disable
supportComment: >
We use the issue tracker exclusively for bug reports, development and feature requests.
However, this issue appears to be a support request.
Please use the [support channel on our Discord](https://discord.gg/kZ7RdrD) to get help.
# Close issues marked as support requests
close: true

# Lock issues marked as support requests
lock: false

# Assign `off-topic` as the reason for locking. Set to `false` to disable
setLockReason: false

# Repository to extend settings from
# _extends: .github
95 changes: 89 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,103 @@
# Enigmatica 2: Expert Changelog
### Enigmatica 2: Expert Changelog

## 1.82

_Remember to use the command `/bq_admin default load` when updating_

_[Mod Updates](https://github.com/NillerMedDild/Enigmatica2Expert/blob/master/changelogs/CHANGELOG_MODS_1.82.txt)_ | _Using Forge-1.12.2-14.23.5.2847_

**Bug fixes**

*

**New Mod Interactions**

- Added chiseling of Alabaster and SonarCore's blocks
- Added Draconic Evolution tablet to Akashic Tome
- Advanced Generators Turbine now accept twice as many fuels. See Turbine Controller's Tooltip for the list
- A lot of new drops for IC2 Scrapboxes
- Blacklist Unobtainable Foods from Spice of Life: Carrot Edition [\#1811](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1811)
- Buff Thermal Dynamics Fluxducts [\#1747](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1747)
- Can't make some ground meats in the pulverizer [\#1801](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1801)
- IC2 Crushed Uranium doesn't have a furnace recipe [\#1804](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1804)
- IC2 Macerator can't make charcoal dust [\#1805](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1805)
- Industrial Foregoing drill no longer outputs incorrect ores (BoP Amber for example)
- JEI: Disabled hiding of a ton of items. Performance may be affected when looking at pages with many flowing fluids.
- Morphing Tool Additions [\#1803](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1803)
- Nether quartz dust clean-up [\#1701](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1701)
- New drops for Ball Of Fur *(see "Drops from Ball Of Fur" in JEI)*
- +5 Thermal Expansion Coolants (for Mediator and Dynamo)
- Quark: Disabled the config that allows Pistons to move tile entities
- Twilight Forest Hills now generates ore stalactites: Prosperity, Mithril, Thorium, Boron, Lithium, Magnesium
- Ultimate Tier Installer JEI description [\#1780](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1780)
- Use for TiCon's Slimy Dirt [\#1710](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1710)
- New ore deposits for the Immersive Engineering Excavator
* Nuclear Craft's vein
* Osmium vein
* *(Core Sample texture can be glitched)*
- Added recycling for:
* 6 Quark Crystals
* Mystical Agriculture Water Cans
* Myrmex Resin and Cocoons (output TE Resin)
* Slime Vines, Grass and Saplings
* Minotaur Axes
* Twilight Forest blocks (see NuclearCraft Rock Crusher in JEI)
* Vanilla Arrows
- Orechid from Botania
- -Yellorite Ore
- +NuclearCraft Ores
- +Prosperity Ore

**Changes**

- Advanced Rocketry Crystallizer now can grow Astral Sorcery Crystals and Gems
- Advanced Rocketry Tank way cheaper (From plates instead of sheets)
- Blood Tanks remake: Now crafted on Blood Altair (2M essence for tier 16)
- Blue and Purple liquid slime now can be cast on Table or Basin
- Cheaper Extra Utilities Wireless Transmitter and Battery
- Extended Crafting Automation Table no longer requires Crystaltine
- Fixed 4->2 planks for Garden Cloche in Advanced Thermionic Fabricator
- Harder Integrated Dynamics Omnidirectional Connector (now require Ender Chest)
- New Insanium recipe in Quantum Compressor
- New recipes for Quark Chests
- Random Things Igniter now requires fire dragon blood to craft
- S'More ingredients (now able to make S'Mores without NC machines)
- Simplify Ender IO Niard recipe (simple components instead of EIO machine case)
- Sonar Core's decorative blocks can now use any oredictionaried dye
- Thermal Expansion Ducts now can be made in many different machines (low-tier machines require more liquid)
- Vanilla Hopper now uses any chest in the recipe (not only vanilla one)
- The following can now be cleared for liquid:
* Cyclic Tanks
* Extra Utilities Drums
* Thermal Expansion Tanks and Reservoirs
- Advanced Rocketry machines now work about 2-20x times faster, new compat recipes for:
* Electrolyser
* Electric Arc Furnace
* Cutting Machine
* Chemical Reactor
- Log cutting rework:
* All the machines can cut all the logs now
* Some have different output amount
* Pulp is always the same
* Some modded plank recipes can reappear (like Giant Log -> 64 Planks)
- New compat recipes for:
* Black Quartz
* Sky Stone Dust
* Nano Glowstone
* Energy Crystal
* Nuclear Craft's HSLA
* End Stone Dust

**Bug Fixes**

* EnvironmentalTech: Removed Aluminium Ore as a possible output from the Tier 6 Void Ore Miner

**Mod additions**

- EnderTweaker
- Integrated NBT [\#1822](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1822)
- Extra Bit Manipulation [#1758](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1758)

**Mod removals**

* Item Filters (Added during a test, forgot to remove it)

# Enigmatica 2: Expert Changelog

## 1.81a

Expand Down
84 changes: 84 additions & 0 deletions changelogs/CHANGELOG_MODS_1.82.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
==================================================
Enigmatica2Expert 1.81a --> Enigmatica2Expert 1.82
==================================================

Updated:
Advanced Rocketry (AdvancedRocketry 1.12.2-1.7.0-232 build -232 for 1.12.2 --> AdvancedRocketry 1.12.2-1.7.0-235 build -235 for 1.12.2):
AdvancedRocketry 1.12.2-1.7.0-235 build -235 for 1.12.2:
Current release 1.12.2-1.7.0-235
* [ Fix planetsize calculations and orbitalPhi calculations (#1929) * Fixes planetary and solar size both mismatches and zeroes - Fixes the bug with planet sizes where they were essentially zero (I messed up a while ago) - Fixes planetary sizes being affected the wrong way - Fixes IRL-noncompliant mismatch between planet and solar size - Fixes apparent lack of gravity affecting certain planetary display sizes - Introduces realistic x^0.4 scaling for increase in size when g is multiplied by x * Fix extraneous 2x multiplier for asteroid dimensions * Add proper scaling to asteroid worlds for gravity * Fix orbitalPhi always being reset to 10, and fix orbitalTheta to be opposite the sun by default](https://github.com/zmaster587/AdvancedRocketry/commit/233f3934e102787)
* [ Texture updates and 16x textures (#1889) * Added redone sawblade texture * Slight texture update * Make more textures 16x * Add forgotten 16x texture](https://github.com/zmaster587/AdvancedRocketry/commit/a40bf119f9859bb)
* [ Add API Average Temperature access (#1934) * Add API Average Temperature access * Readd line to fix possible edge cases](https://github.com/zmaster587/AdvancedRocketry/commit/627ac11fe5230b8)

AdvancedRocketry 1.12.2-1.7.0-234 build -234 for 1.12.2:
Current release 1.12.2-1.7.0-234
* [ resolves #1912](https://github.com/zmaster587/AdvancedRocketry/commit/c3698657ed6162f)
* [ fix space in biome registry name](https://github.com/zmaster587/AdvancedRocketry/commit/561b4b24aa53671)
* [ Add OreDictionary entries to Warp Core blocks to allow for CT to change them (#1884) - Titanium Block is "blockWarpCoreRim" - Gold Block is "blockWarpCoreCore"](https://github.com/zmaster587/AdvancedRocketry/commit/9e9dd80c8425b77)
* [ Add check to see if gas giant gas is registered by name](https://github.com/zmaster587/AdvancedRocketry/commit/d53abb338a60692)
* [ Add ore:slab oredict entry (#1878) Doesn't exist by default](https://github.com/zmaster587/AdvancedRocketry/commit/81143e73d0951dd)
* [ Fixed lava oceans always spawning if planets were >100K (#1877)](https://github.com/zmaster587/AdvancedRocketry/commit/602a03b98ecd8d3)
* [ Laser entities require 'confirmation' that they exist from a control block since there's no easy way to make an entity simply not save. Fixes #1873](https://github.com/zmaster587/AdvancedRocketry/commit/70804b4766ac443)
* [ Wireless Transceiver improvements (#1869) * Fixed Wireless Transceiver locking data type to distance * Fixed Wireless Transceiver not pulling correct data type from satellite * Made Wireless Transceiver not suffocate players * Fixed spelling in Wireless Transceiver display name (ie -> ei)](https://github.com/zmaster587/AdvancedRocketry/commit/3b919179c5ad585)
* [ Use oredictionary instead of Vanilla blocks (#1875) Supports Terrafirmacraft, which has no Vanilla stone.](https://github.com/zmaster587/AdvancedRocketry/commit/1b7a0846dc15aa5)
* [ Fixed orbitalTheta not saving to planetDefs.xml (#1866)](https://github.com/zmaster587/AdvancedRocketry/commit/aad4c5c9a3ab333)
* [ Many new atmosphere types and new effects [1.12.2] (#1856) * Added new Superheated and NoO2 atmospheres, parity with 1.7.10 * Fix durations between hurt for 1.12.2 * Fixes #1410, #1091](https://github.com/zmaster587/AdvancedRocketry/commit/e06e15bf39f291b)
* [ Fix for moons having solar properties for their orbits (#1851)](https://github.com/zmaster587/AdvancedRocketry/commit/33045e7d694567c)
* [ Fix orbitalDistance being used in temperature calculations instead of getSolarOrbitalDistance (#1841)](https://github.com/zmaster587/AdvancedRocketry/commit/0aaf0709b4cb353)
* [ Make LowOxygen atmosphere attainable on a planet with <75 and >25 atmosphere pressure (#1822) Fixes #1091](https://github.com/zmaster587/AdvancedRocketry/commit/cdcfc2e073c6dc0)
* [ ...fixing Galacticcraft link....](https://github.com/zmaster587/AdvancedRocketry/commit/a49a9f7894b20cc)
* [ Possible fix for #1832](https://github.com/zmaster587/AdvancedRocketry/commit/d6a9a3b617d9120)
* [ Fix issue where on laggy servers, sometimes the player would not be mounted to the rocket after teleporting, or getting stuck at y=1000, related to #1818](https://github.com/zmaster587/AdvancedRocketry/commit/5b5180c3af4e13b)
* [ Fix sky not rendering properly below sealevel](https://github.com/zmaster587/AdvancedRocketry/commit/a0c255d1b0ffcf3)
* [ Fix crash with holographic projector with substars, #1817. Update some 1.7 rendering code to 1.12](https://github.com/zmaster587/AdvancedRocketry/commit/ed5d3d63d684b28)
* [ 16x textures and four new planet textures added (#1811) * 16x textures and four new planet textures added * 16x guidance computer access hatch](https://github.com/zmaster587/AdvancedRocketry/commit/276e4e444f0dde5)
* [ Fixed temperature being off by a factor of sqrt(2) (#1813)](https://github.com/zmaster587/AdvancedRocketry/commit/797b06d2df83762)
* [ Hopefully fix build errors from being unable to find the mappings](https://github.com/zmaster587/AdvancedRocketry/commit/5108c05e401a2a0)
* [ reset changelog ver](https://github.com/zmaster587/AdvancedRocketry/commit/e642dd2d82c0470)
* [ Fix lightwood not replacing saplings, fixes #1808](https://github.com/zmaster587/AdvancedRocketry/commit/2c31a2c2329dafd)
* [ Fix bug where onlyNeedMask is true where the suit can't protect the player](https://github.com/zmaster587/AdvancedRocketry/commit/e29ffe3d2c242c8)
* [ Centralize spacesuit and atm protection code, superhighpressure atm should now be protected by spacesuit](https://github.com/zmaster587/AdvancedRocketry/commit/f45dd1887335068)
* [ Add sol to the default fallback world. Resolves #1789](https://github.com/zmaster587/AdvancedRocketry/commit/6efde4c3d7752a1)
* [ Updated 1.12 Branch to Infinite-Distance system as with 1.7.10 branch (#1796) * Added all of the requisite changes for infinite-distance system and parity with 1.7.10 updates * A couple additions that make the game load, forgotten from a previous attempt * Put caps on values that can be displayed in the holographic projector * Add comments to explain the switch to Kelvin for temperature * More places for temperature specification, and a missed comment at the top of DimensionProperties.java Co-authored-by: zmaster587 <[email protected]>](https://github.com/zmaster587/AdvancedRocketry/commit/34f1e3023c62dca)
* [ add missing lang entry](https://github.com/zmaster587/AdvancedRocketry/commit/079ca985fa8dd78)
* [ added a space to the gravity controller](https://github.com/zmaster587/AdvancedRocketry/commit/29b0e61815cd688)
* [ Add ability to toggle planet decoration in the UI](https://github.com/zmaster587/AdvancedRocketry/commit/113bb593977bbb0)
* [ fix incorrect decimal in the gravity area controller](https://github.com/zmaster587/AdvancedRocketry/commit/ba997bacd4bd29c)
* [ remove unused booleans](https://github.com/zmaster587/AdvancedRocketry/commit/63c8cb19b8bb67d)

Cyclic (Cyclic-1.12.2-1.20.5.jar --> Cyclic-1.12.2-1.20.6.jar):
Cyclic-1.12.2-1.20.6.jar:
Auto crafter now correctly moves container items to output slots and refills them (such as full buckets in cake recipe).
Boomerang fixed to not break certain strong blocks such as Reinforced glass from securitycraft when thrown.
Also Boomerang by default will no longer break blocks when flying (config boomerang.doesBreakBlocks to restore old way).
(trunksbomb) Fix Pattern Replicator to not cause out of bounds exception

Ender IO (Ender IO - 5.2.60 --> Ender IO - 5.2.61):
Ender IO - 5.2.61:
You need either the main file or a selection of the "split" jars, not both!
[Changelog (this build)]() / [Changelog (all builds)]()
Fixed head drop calculation code
Added configs for anvil recycling
Detect other mods manipulating armor pieces in inventory
Fixed vanilla smelting recipe being tagged 'normal' instead of 'simple'
Fixed conduit changes not properly updating neighbours
Changed Power Monitor connection logic

NuclearCraft (NuclearCraft-2.18x-1.12.2 --> NuclearCraft-2.18y-1.12.2):
NuclearCraft-2.18y-1.12.2:
+ Added config to disable world radiation block checking
* Removed block mutation config - recipes are now only added via CraftTweaker

Pretty Beaches (PrettyBeaches_1.12.2-1.0.4.jar --> PrettyBeaches_1.12.2-1.1.0.jar):
PrettyBeaches_1.12.2-1.1.0.jar:
Added support for wildcards in affected blocks config ([by KenyMylankca](https://github.com/blay09/PrettyBeaches/pull/18))
Added infiniteBucketWater option, to allow buckets to pull water without destroying source blocks (disabled by default) ([by KenyMylankca](https://github.com/blay09/PrettyBeaches/pull/18))

RandomPatches (RandomPatches 1.12.2-1.22.1.5 --> RandomPatches 1.12.2-1.22.1.7):
RandomPatches 1.12.2-1.22.1.7:
Fixed the ItemBucket patch.

RandomPatches 1.12.2-1.22.1.6:
Fixed CatServer compatibility with the ItemBucket patch again.

Generated using [ChangelogGenerator 2.0.0-pre3](https://github.com/TheRandomLabs/ChangelogGenerator).
Loading

0 comments on commit 639a0e7

Please sign in to comment.