merge remote branch[Hit return to continue]

chore: add README.md
chore: update gitignore
2022-12-17 17:03:51 +01:00 · 2022-12-17 17:02:14 +01:00 · 2022-12-17 16:57:17 +01:00
205 changed files with 14 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@
 .idea
 build
 run
+bin
--- a/README.md
+++ b/README.md
@ -0,0 +1,13 @@
+# Universal Electricity
+
+This is a port of the 1.5.2 version of the universal electricity mod library for 1.7.10 including some concepts from universal electricity 1.6.4.
+
+## Mods using this library:
+
+- [Basic Components](https://git.tilera.org/Anvilcraft/basic-components)
+- [Atomic Science](https://git.tilera.org/Anvilcraft/atomicscience)
+- [Assembly Line](https://git.tilera.org/Anvilcraft/assemblyline)
+- [MFFS](https://git.tilera.org/Anvilcraft/mffs)
+- [ICBM](https://git.tilera.org/Anvilcraft/icbm)
+- [Electric Expansion](https://git.tilera.org/Anvilcraft/electric-expansion)
+- [Mekanism (tilera's fork)](https://git.tilera.org/tilera/Mekanism-1.7.10-Community-Edition)
--- a/bin/main/assemblyline/api/IArmbot.class
+++ b/bin/main/assemblyline/api/IArmbot.class
--- a/bin/main/assemblyline/api/IArmbotUseable.class
+++ b/bin/main/assemblyline/api/IArmbotUseable.class
--- a/bin/main/assemblyline/api/IBelt.class
+++ b/bin/main/assemblyline/api/IBelt.class
--- a/bin/main/assemblyline/api/IBotArm.class
+++ b/bin/main/assemblyline/api/IBotArm.class
--- a/bin/main/assemblyline/api/ICraneConnectable.class
+++ b/bin/main/assemblyline/api/ICraneConnectable.class
--- a/bin/main/assemblyline/api/ICraneStructure.class
+++ b/bin/main/assemblyline/api/ICraneStructure.class
--- a/bin/main/assemblyline/api/IFilterable.class
+++ b/bin/main/assemblyline/api/IFilterable.class
--- a/bin/main/assemblyline/api/IManipulator.class
+++ b/bin/main/assemblyline/api/IManipulator.class
--- a/bin/main/atomicscience/api/AtomicScience.class
+++ b/bin/main/atomicscience/api/AtomicScience.class
--- a/bin/main/atomicscience/api/BlockRadioactive.class
+++ b/bin/main/atomicscience/api/BlockRadioactive.class
--- a/bin/main/atomicscience/api/IAntiPoisonArmor.class
+++ b/bin/main/atomicscience/api/IAntiPoisonArmor.class
--- a/bin/main/atomicscience/api/IAntiPoisonBlock.class
+++ b/bin/main/atomicscience/api/IAntiPoisonBlock.class
--- a/bin/main/atomicscience/api/IElectromagnet.class
+++ b/bin/main/atomicscience/api/IElectromagnet.class
--- a/bin/main/atomicscience/api/IFissileMaterial.class
+++ b/bin/main/atomicscience/api/IFissileMaterial.class
--- a/bin/main/atomicscience/api/IHeatSource.class
+++ b/bin/main/atomicscience/api/IHeatSource.class
--- a/bin/main/atomicscience/api/IReactor.class
+++ b/bin/main/atomicscience/api/IReactor.class
--- a/bin/main/atomicscience/api/ISteamReceptor.class
+++ b/bin/main/atomicscience/api/ISteamReceptor.class
--- a/bin/main/atomicscience/api/ITemperature.class
+++ b/bin/main/atomicscience/api/ITemperature.class
--- a/bin/main/atomicscience/api/Plasma$IPlasma.class
+++ b/bin/main/atomicscience/api/Plasma$IPlasma.class
--- a/bin/main/atomicscience/api/Plasma.class
+++ b/bin/main/atomicscience/api/Plasma.class
--- a/bin/main/atomicscience/api/poison/Poison$ArmorType.class
+++ b/bin/main/atomicscience/api/poison/Poison$ArmorType.class
--- a/bin/main/atomicscience/api/poison/Poison.class
+++ b/bin/main/atomicscience/api/poison/Poison.class
--- a/bin/main/atomicscience/api/poison/PoisonRadiation.class
+++ b/bin/main/atomicscience/api/poison/PoisonRadiation.class
--- a/bin/main/atomicscience/api/poison/PotionRadiation.class
+++ b/bin/main/atomicscience/api/poison/PotionRadiation.class
--- a/bin/main/cofh/api/energy/IEnergyConnection.class
+++ b/bin/main/cofh/api/energy/IEnergyConnection.class
--- a/bin/main/cofh/api/energy/IEnergyProvider.class
+++ b/bin/main/cofh/api/energy/IEnergyProvider.class
--- a/bin/main/cofh/api/energy/IEnergyReceiver.class
+++ b/bin/main/cofh/api/energy/IEnergyReceiver.class
--- a/bin/main/cofh/api/energy/IEnergyStorage.class
+++ b/bin/main/cofh/api/energy/IEnergyStorage.class
--- a/bin/main/dan200/computercraft/api/ComputerCraftAPI.class
+++ b/bin/main/dan200/computercraft/api/ComputerCraftAPI.class
--- a/bin/main/dan200/computercraft/api/filesystem/IMount.class
+++ b/bin/main/dan200/computercraft/api/filesystem/IMount.class
--- a/bin/main/dan200/computercraft/api/filesystem/IWritableMount.class
+++ b/bin/main/dan200/computercraft/api/filesystem/IWritableMount.class
--- a/bin/main/dan200/computercraft/api/filesystem/package-info.class
+++ b/bin/main/dan200/computercraft/api/filesystem/package-info.class
--- a/bin/main/dan200/computercraft/api/lua/ILuaContext.class
+++ b/bin/main/dan200/computercraft/api/lua/ILuaContext.class
--- a/bin/main/dan200/computercraft/api/lua/ILuaObject.class
+++ b/bin/main/dan200/computercraft/api/lua/ILuaObject.class
--- a/bin/main/dan200/computercraft/api/lua/ILuaTask.class
+++ b/bin/main/dan200/computercraft/api/lua/ILuaTask.class
--- a/bin/main/dan200/computercraft/api/lua/LuaException.class
+++ b/bin/main/dan200/computercraft/api/lua/LuaException.class
--- a/bin/main/dan200/computercraft/api/lua/package-info.class
+++ b/bin/main/dan200/computercraft/api/lua/package-info.class
--- a/bin/main/dan200/computercraft/api/media/IMedia.class
+++ b/bin/main/dan200/computercraft/api/media/IMedia.class
--- a/bin/main/dan200/computercraft/api/media/IMediaProvider.class
+++ b/bin/main/dan200/computercraft/api/media/IMediaProvider.class
--- a/bin/main/dan200/computercraft/api/media/package-info.class
+++ b/bin/main/dan200/computercraft/api/media/package-info.class
--- a/bin/main/dan200/computercraft/api/package-info.class
+++ b/bin/main/dan200/computercraft/api/package-info.class
--- a/bin/main/dan200/computercraft/api/peripheral/IComputerAccess.class
+++ b/bin/main/dan200/computercraft/api/peripheral/IComputerAccess.class
--- a/bin/main/dan200/computercraft/api/peripheral/IPeripheral.class
+++ b/bin/main/dan200/computercraft/api/peripheral/IPeripheral.class
--- a/bin/main/dan200/computercraft/api/peripheral/IPeripheralProvider.class
+++ b/bin/main/dan200/computercraft/api/peripheral/IPeripheralProvider.class
--- a/bin/main/dan200/computercraft/api/peripheral/package-info.class
+++ b/bin/main/dan200/computercraft/api/peripheral/package-info.class
--- a/bin/main/dan200/computercraft/api/permissions/ITurtlePermissionProvider.class
+++ b/bin/main/dan200/computercraft/api/permissions/ITurtlePermissionProvider.class
--- a/bin/main/dan200/computercraft/api/permissions/package-info.class
+++ b/bin/main/dan200/computercraft/api/permissions/package-info.class
--- a/bin/main/dan200/computercraft/api/redstone/IBundledRedstoneProvider.class
+++ b/bin/main/dan200/computercraft/api/redstone/IBundledRedstoneProvider.class
--- a/bin/main/dan200/computercraft/api/redstone/package-info.class
+++ b/bin/main/dan200/computercraft/api/redstone/package-info.class
--- a/bin/main/dan200/computercraft/api/turtle/ITurtleAccess.class
+++ b/bin/main/dan200/computercraft/api/turtle/ITurtleAccess.class
--- a/bin/main/dan200/computercraft/api/turtle/ITurtleCommand.class
+++ b/bin/main/dan200/computercraft/api/turtle/ITurtleCommand.class
--- a/bin/main/dan200/computercraft/api/turtle/ITurtleUpgrade.class
+++ b/bin/main/dan200/computercraft/api/turtle/ITurtleUpgrade.class
--- a/bin/main/dan200/computercraft/api/turtle/TurtleAnimation.class
+++ b/bin/main/dan200/computercraft/api/turtle/TurtleAnimation.class
--- a/bin/main/dan200/computercraft/api/turtle/TurtleCommandResult.class
+++ b/bin/main/dan200/computercraft/api/turtle/TurtleCommandResult.class
--- a/bin/main/dan200/computercraft/api/turtle/TurtleSide.class
+++ b/bin/main/dan200/computercraft/api/turtle/TurtleSide.class
--- a/bin/main/dan200/computercraft/api/turtle/TurtleUpgradeType.class
+++ b/bin/main/dan200/computercraft/api/turtle/TurtleUpgradeType.class
--- a/bin/main/dan200/computercraft/api/turtle/TurtleVerb.class
+++ b/bin/main/dan200/computercraft/api/turtle/TurtleVerb.class
--- a/bin/main/dan200/computercraft/api/turtle/package-info.class
+++ b/bin/main/dan200/computercraft/api/turtle/package-info.class
--- a/bin/main/icbm/api/IAmmunition.class
+++ b/bin/main/icbm/api/IAmmunition.class
--- a/bin/main/icbm/api/IBlockFrequency.class
+++ b/bin/main/icbm/api/IBlockFrequency.class
--- a/bin/main/icbm/api/ICBM.class
+++ b/bin/main/icbm/api/ICBM.class
--- a/bin/main/icbm/api/ICBMFlags.class
+++ b/bin/main/icbm/api/ICBMFlags.class
--- a/bin/main/icbm/api/ICamouflageMaterial.class
+++ b/bin/main/icbm/api/ICamouflageMaterial.class
--- a/bin/main/icbm/api/IHackable.class
+++ b/bin/main/icbm/api/IHackable.class
--- a/bin/main/icbm/api/IItemFrequency.class
+++ b/bin/main/icbm/api/IItemFrequency.class
--- a/bin/main/icbm/api/ILauncherContainer.class
+++ b/bin/main/icbm/api/ILauncherContainer.class
--- a/bin/main/icbm/api/ILauncherController.class
+++ b/bin/main/icbm/api/ILauncherController.class
--- a/bin/main/icbm/api/IMissile.class
+++ b/bin/main/icbm/api/IMissile.class
--- a/bin/main/icbm/api/IMissileLockable.class
+++ b/bin/main/icbm/api/IMissileLockable.class
--- a/bin/main/icbm/api/ITracker.class
+++ b/bin/main/icbm/api/ITracker.class
--- a/bin/main/icbm/api/LauncherType.class
+++ b/bin/main/icbm/api/LauncherType.class
--- a/bin/main/icbm/api/RadarRegistry.class
+++ b/bin/main/icbm/api/RadarRegistry.class
--- a/bin/main/icbm/api/explosion/ExplosionEvent$PostExplosionEvent.class
+++ b/bin/main/icbm/api/explosion/ExplosionEvent$PostExplosionEvent.class
--- a/bin/main/icbm/api/explosion/ExplosionEvent$PreExplosionEvent.class
+++ b/bin/main/icbm/api/explosion/ExplosionEvent$PreExplosionEvent.class
--- a/bin/main/icbm/api/explosion/ExplosionEvent.class
+++ b/bin/main/icbm/api/explosion/ExplosionEvent.class
--- a/bin/main/icbm/api/explosion/IEMPBlock.class
+++ b/bin/main/icbm/api/explosion/IEMPBlock.class
--- a/bin/main/icbm/api/explosion/IEMPItem.class
+++ b/bin/main/icbm/api/explosion/IEMPItem.class
--- a/bin/main/icbm/api/explosion/IExplosive.class
+++ b/bin/main/icbm/api/explosion/IExplosive.class
--- a/bin/main/icbm/api/explosion/IExplosiveContainer.class
+++ b/bin/main/icbm/api/explosion/IExplosiveContainer.class
--- a/bin/main/icbm/api/explosion/IExplosiveIgnore.class
+++ b/bin/main/icbm/api/explosion/IExplosiveIgnore.class
--- a/bin/main/icbm/api/sentry/IAATarget.class
+++ b/bin/main/icbm/api/sentry/IAATarget.class
--- a/bin/main/mffs/api/Blacklist.class
+++ b/bin/main/mffs/api/Blacklist.class
--- a/bin/main/mffs/api/IActivatable.class
+++ b/bin/main/mffs/api/IActivatable.class
--- a/bin/main/mffs/api/IBiometricIdentifierLink.class
+++ b/bin/main/mffs/api/IBiometricIdentifierLink.class
--- a/bin/main/mffs/api/ICache.class
+++ b/bin/main/mffs/api/ICache.class
--- a/bin/main/mffs/api/IFieldInteraction.class
+++ b/bin/main/mffs/api/IFieldInteraction.class
--- a/bin/main/mffs/api/IForceFieldBlock.class
+++ b/bin/main/mffs/api/IForceFieldBlock.class
--- a/bin/main/mffs/api/IProjector.class
+++ b/bin/main/mffs/api/IProjector.class
--- a/bin/main/mffs/api/ISpecialForceManipulation.class
+++ b/bin/main/mffs/api/ISpecialForceManipulation.class
--- a/bin/main/mffs/api/card/ICard.class
+++ b/bin/main/mffs/api/card/ICard.class
--- a/bin/main/mffs/api/card/ICardIdentification.class
+++ b/bin/main/mffs/api/card/ICardIdentification.class
--- a/bin/main/mffs/api/card/ICardInfinite.class
+++ b/bin/main/mffs/api/card/ICardInfinite.class
--- a/bin/main/mffs/api/card/ICardLink.class
+++ b/bin/main/mffs/api/card/ICardLink.class
--- a/bin/main/mffs/api/fortron/IFortronCapacitor.class
+++ b/bin/main/mffs/api/fortron/IFortronCapacitor.class
--- a/bin/main/mffs/api/fortron/IFortronFrequency.class
+++ b/bin/main/mffs/api/fortron/IFortronFrequency.class
--- a/bin/main/mffs/api/fortron/IFortronStorage.class
+++ b/bin/main/mffs/api/fortron/IFortronStorage.class
--- a/bin/main/mffs/api/modules/IInterdictionMatrixModule.class
+++ b/bin/main/mffs/api/modules/IInterdictionMatrixModule.class
--- a/bin/main/mffs/api/modules/IModule.class
+++ b/bin/main/mffs/api/modules/IModule.class
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Timo Ley	7a29f18301	merge remote branch[Hit return to continue] continuous-integration/drone/push Build is passing Details	2022-12-17 17:03:51 +01:00
Timo Ley	34c11fd9fd	chore: add README.md	2022-12-17 17:02:14 +01:00
Timo Ley	339dd1894a	chore: update gitignore	2022-12-17 16:57:17 +01:00