LemADEC
|
da53d13792
|
Merge branch 'master' of https://github.com/Cr0s/WarpDrive into Cr0s-master
Conflicts:
README.md
src/assets/warpdrive/textures/blocks/camOverlay.png
src/assets/warpdrive/textures/blocks/lasercamOverlay.png
src/cr0s/WarpDrive/BlockAir.java
src/cr0s/WarpDrive/CloakChunkWatcher.java
src/cr0s/WarpDrive/CloakManager.java
src/cr0s/WarpDrive/EntityCamera.java
src/cr0s/WarpDrive/EntityJump.java
src/cr0s/WarpDrive/JumpGatesRegistry.java
src/cr0s/WarpDrive/PacketHandler.java
src/cr0s/WarpDrive/SpaceEventHandler.java
src/cr0s/WarpDrive/TileEntityMiningLaser.java
src/cr0s/WarpDrive/TileEntityProtocol.java
src/cr0s/WarpDrive/TileEntityRadar.java
src/cr0s/WarpDrive/TileEntityReactor.java
src/cr0s/WarpDrive/WarpCoresRegistry.java
src/cr0s/WarpDrive/WarpDrive.java
src/cr0s/WarpDrive/WarpDriveConfig.java
src/cr0s/WarpDrive/machines/BlockCloakingCoil.java
src/cr0s/WarpDrive/machines/BlockCloakingDeviceCore.java
src/cr0s/WarpDrive/machines/BlockProtocol.java
src/cr0s/WarpDrive/machines/BlockReactor.java
src/cr0s/WarpDrive/machines/BlockShipScanner.java
src/cr0s/WarpDrive/machines/TileEntityCloakingDeviceCore.java
src/cr0s/WarpDrive/machines/TileEntityLaser.java
src/cr0s/WarpDrive/machines/TileEntityShipScanner.java
Removed dead files
Fixed registry check for overlapping field
|
2014-08-07 11:31:39 +02:00 |
|
DarkholmeTenk
|
d82963121a
|
Readme.md Update
|
2014-02-26 16:20:33 +00:00 |
|
U-Admin-DPC\Admin
|
1bd5572148
|
mergetest
|
2014-02-26 09:49:36 +00:00 |
|
Cr0s
|
2285a5d75c
|
Create README.md
|
2014-02-25 15:03:41 -08:00 |
|
Anus
|
86e96a43ee
|
Fixed TE moving when jump
* Fixed: some TileEntities may be corrupted after jump
* Entities of Jump, Star core and Sphere Gen is now invisible
|
2014-02-26 03:00:37 +04:00 |
|
igal2001
|
a95f77f81c
|
Update README.md
|
2014-02-23 17:46:29 +02:00 |
|
mbax2sb4
|
07cdf6ba69
|
Testing build script
|
2014-02-17 14:37:02 +00:00 |
|
Cr0s
|
c9c2826ca0
|
Create README.md
|
2013-08-13 13:37:35 -07:00 |
|