[WIP] [DNM] Ports/1.10 #861
Open
+45,806
−61,035
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Neat. Will try poking around with this. Just read through most of the diffs. |
Fixed some errors mainly recipe ones.
Updating Eln.java
Updated readme for 1.10
Quite a lot of simple compilation fixes. * Update ComputerProbeBlock.java * Update PacketHandler.java * Update GuiHandler.java * Update Achievements.java * Update CableRender.java * Update TileEntityDestructor.java * Update FrameTime.java * Update ClientPacketHandler.java * Update GhostGroup.java * Update Utils.java * Update EnergyConverterElnToOtherBlock.java * Update EnergyConverterElnToOtherFireWallRf.java * Update EnergyConverterElnToOtherFireWallOc.java * Update TestEntity.java * Update TestBlock.java * Update BatteryChargerElement.java * Update ElectricalCableElement.java * Update DataLogs.java * Update ElectricalDataLoggerContainer.java * Update ElectricalDataLoggerRender.java * Update ElectricalEntitySensorElement.java * Update ElectricalEntitySensorSlowProcess.java * Update ElectricalFireDetectorElement.java * Update ElectricalFireDetectorSlowProcess.java * Update ElectricalGateSourceElement.java * Update ElectricalMathContainer.java * Update ElectricalMathRender.java * Update ElectricalRedstoneInputElement.java * Update ElectricalSensorElement.java * Update ElectricalSwitchElement.java * Update ElectricalWatchElement.java * Update ElectricalWindSensorElement.java * Update ElectricalWindSensorSlowProcess.java * Update ElectricalWindSensorElement.java * Update GroundCableElement.java * Update LampSocketElement.java * Update LampSocketProcess.java * Update LightBlock.java * Update LightBlockEntity.java * Update ElectricalFireDetectorSlowProcess.java * Update LightBlockEntity.java * Update LightBlockEntity.java
Disable all the armor for now.
# Conflicts: # src/main/java/mods/eln/Eln.java # src/main/java/mods/eln/item/ThermalIsolatorElement.java # src/main/java/mods/eln/item/electricalitem/ElectricalLampItem.kt # src/main/java/mods/eln/item/electricalitem/LampItem.kt
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR currently exists only as a backup. It won't compile.
While I'm making fairly rapid progress at the moment, I'm absolutely accepting help. (From any decent Java coders.)