LemADEC
|
37b0141393
|
Merge branch 'master' of https://github.com/Cr0s/WarpDrive into Cr0s-master2
Initial merge
Conflicts:
client/ClientProxy.java
src/assets/warpdrive/lang/en_US.lang
src/assets/warpdrive/lua/cloakingdevicecore/cloak1
src/assets/warpdrive/lua/cloakingdevicecore/cloak2
src/assets/warpdrive/lua/radar/ping
src/assets/warpdrive/lua/radar/scan
src/assets/warpdrive/textures/blocks/transporterTop.png
src/cr0s/WarpDrive/BlockAirGenerator.java
src/cr0s/WarpDrive/BlockLift.java
src/cr0s/WarpDrive/BlockRadar.java
src/cr0s/WarpDrive/BlockReactor.java
src/cr0s/WarpDrive/CloakChunkWatcher.java
src/cr0s/WarpDrive/EntityJump.java
src/cr0s/WarpDrive/GravityManager.java
src/cr0s/WarpDrive/PacketHandler.java
src/cr0s/WarpDrive/SpaceEventHandler.java
src/cr0s/WarpDrive/TileEntityLaser.java
src/cr0s/WarpDrive/TileEntityShipScanner.java
src/cr0s/WarpDrive/WarpDrive.java
src/cr0s/WarpDrive/WarpDriveConfig.java
src/cr0s/WarpDrive/WorldGenStation.java
src/cr0s/WarpDrive/api/IBreathingHelmet.java
src/cr0s/WarpDrive/block/BlockAir.java
src/cr0s/WarpDrive/block/BlockGas.java
src/cr0s/WarpDrive/command/DebugCommand.java
src/cr0s/WarpDrive/command/GenerateCommand.java
src/cr0s/WarpDrive/command/JumpgateCommand.java
src/cr0s/WarpDrive/data/CamRegistry.java
src/cr0s/WarpDrive/data/CloakManager.java
src/cr0s/WarpDrive/data/JumpgatesRegistry.java
src/cr0s/WarpDrive/data/TransitionPlane.java
src/cr0s/WarpDrive/data/WarpCoresRegistry.java
src/cr0s/WarpDrive/item/ItemWarpComponent.java
src/cr0s/WarpDrive/machines/BlockCamera.java
src/cr0s/WarpDrive/machines/BlockCloakingCoil.java
src/cr0s/WarpDrive/machines/BlockCloakingDeviceCore.java
src/cr0s/WarpDrive/machines/BlockLaserCam.java
src/cr0s/WarpDrive/machines/BlockMonitor.java
src/cr0s/WarpDrive/machines/BlockParticleBooster.java
src/cr0s/WarpDrive/machines/BlockPowerLaser.java
src/cr0s/WarpDrive/machines/BlockPowerReactor.java
src/cr0s/WarpDrive/machines/BlockShipScanner.java
src/cr0s/WarpDrive/machines/BlockTransporter.java
src/cr0s/WarpDrive/machines/TileEntityAbstractMiner.java
src/cr0s/WarpDrive/machines/TileEntityAirGenerator.java
src/cr0s/WarpDrive/machines/TileEntityCamera.java
src/cr0s/WarpDrive/machines/TileEntityCloakingDeviceCore.java
src/cr0s/WarpDrive/machines/TileEntityLaserReactorMonitor.java
src/cr0s/WarpDrive/machines/TileEntityLaserTreeFarm.java
src/cr0s/WarpDrive/machines/TileEntityLift.java
src/cr0s/WarpDrive/machines/TileEntityMiningLaser.java
src/cr0s/WarpDrive/machines/TileEntityParticleBooster.java
src/cr0s/WarpDrive/machines/TileEntityPowerLaser.java
src/cr0s/WarpDrive/machines/TileEntityPowerReactor.java
src/cr0s/WarpDrive/machines/TileEntityProtocol.java
src/cr0s/WarpDrive/machines/TileEntityRadar.java
src/cr0s/WarpDrive/machines/TileEntityReactor.java
src/cr0s/WarpDrive/machines/TileEntityTransporter.java
src/cr0s/WarpDrive/machines/WarpChunkTE.java
src/cr0s/WarpDrive/machines/WarpEnergyTE.java
src/cr0s/WarpDrive/machines/WarpTE.java
src/cr0s/WarpDrive/render/CameraOverlay.java
src/cr0s/WarpDrive/render/ClientCameraUtils.java
src/cr0s/WarpDrive/render/EntityCamera.java
src/cr0s/WarpDrive/world/EntitySphereGen.java
src/cr0s/WarpDrive/world/HyperSpaceWorldGenerator.java
src/cr0s/WarpDrive/world/SpaceProvider.java
src/cr0s/WarpDrive/world/SpaceWorldGenerator.java
src/cr0s/WarpDrive/world/WorldGenStructure.java
|
2014-08-27 16:29:30 +02:00 |
|
