Commit graph

10 commits

Author SHA1 Message Date
LemADEC
3cdb002f53 Fixed assertion check so it's actually enabled
Updated folder structure
2017-07-02 19:32:22 +02:00
LemADEC
4874f9afa7 Add IdeaJ make output to ignore list 2016-06-11 15:21:17 +02:00
LemADEC
f4751f466c Ignore mac files 2016-05-14 12:33:19 -04:00
LemADEC
f7e3d4b85e Added git exclusion on dependencies folder 2015-08-09 13:21:01 +02:00
Francesco Macagno
3abc3a3c58 Added Dependencies 2015-07-26 13:57:00 -07:00
Francesco Macagno
caa13e854f Moved to Forge 1.7.10 and fixed folder structure 2015-07-11 17:06:16 -07:00
LemADEC
e1afb2822d Fixing lost client proxy 2014-08-28 15:15:35 +02:00
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
Cr0s
f02ca71a70 Revert "Merging DarkholmeTenk & my branches back to main" 2014-08-08 15:29:16 +04:00
Anus
87d2487dac initial commit 2013-01-22 21:55:20 +04:00