LemADEC
050ce62004
Merge remote-tracking branch 'origin/master' into TDK
2014-09-04 02:43:12 +02:00
LemADEC
1a01d877fa
Logs cleanup
2014-09-03 02:18:21 +02:00
LemADEC
f0a21c2ff1
Camera registry fixes
...
Fixed camera registering 60s late
Fixed frequency packets spam
Refactored camera network sending
2014-09-03 01:09:39 +02:00
LemADEC
3b218f6503
Merge remote-tracking branch 'origin/master' into TDK
2014-09-02 00:43:03 +02:00
LemADEC
ff9c4a629c
Fixed reactor explosion condition & log
2014-09-02 00:31:51 +02:00
LemADEC
53082abc1e
Stabilisation fixes
...
Fixed lasercam failing to return result to Computer
Added particle booster fail safe mode on right click and jump when
invalid tile entity found
Added a few logs to investigate jump client/server desync
2014-09-02 00:28:53 +02:00
LemADEC
5c595e39b1
Integrated last changes
2014-08-29 19:22:39 +02:00
LemADEC
d70ce8c5b1
Merge remote-tracking branch 'origin/master' into TDK
2014-08-29 18:12:31 +02:00
LemADEC
c73f68569f
Disabling get_energy_max to keep client/server sync
2014-08-29 18:10:33 +02:00
LemADEC
832649b868
Fixing core support in mainframe
2014-08-29 17:52:56 +02:00
LemADEC
cdb2d3badd
Better support for core max energy
...
Added get_energy_max method to protocol to support related configuration
option
Code cleanup (magic numbers)
2014-08-29 16:09:43 +02:00
LemADEC
3ff59754d4
Fix crash with CC accessing registry during jump
...
Fixed a concurrent access to cores registry between CC and an ongoing
jump
Code cleanup
2014-08-29 16:08:32 +02:00
LemADEC
d68ceb0774
Merge pull request #9 from LemADEC/master
...
Merge
2014-08-29 05:33:17 +02:00
LemADEC
ddf25d308d
Fixed RF energy handling
...
Improved energy handling readability
Fixed RF energy receiving storing ~16x too much power
Fixed RF energy output consumming ~4x too much power
2014-08-29 04:39:45 +02:00
LemADEC
347be0d809
Power reactor fix
...
Fixed number entries not working in reactor LUA script
Code cleanup
2014-08-29 04:30:54 +02:00
LemADEC
8aa3fe71e1
Merge pull request #8 from LemADEC/master
...
Merging
2014-08-28 22:14:59 +02:00
LemADEC
36544fa1d5
Removing cloaking logs
2014-08-28 21:43:33 +02:00
LemADEC
e1afb2822d
Fixing lost client proxy
2014-08-28 15:15:35 +02:00
LemADEC
de24ae7f7c
Cloaking fixes
...
Fixed cloak transitions between 2 cloaks
Fixed (un)cloaking placing block above/below world limit
Code cleanup
2014-08-28 15:07:20 +02:00
LemADEC
ce6aa1e99a
Another dup bug gone
...
Fixed dup bug with IC2 reactor chambers
Code cleanup
2014-08-27 22:10:21 +02:00
LemADEC
d6c78d3b49
Forgot that
2014-08-27 17:54:01 +02:00
LemADEC
2d2a8a12c4
Revert "Removing experimental/unstable/untested/debug stuff"
...
This reverts commit b76ec1d361
2014-08-27 17:52:47 +02:00
LemADEC
b76ec1d361
Removing experimental/unstable/untested/debug stuff
2014-08-27 17:36:43 +02:00
LemADEC
a026367d3c
Let's merge...
2014-08-27 16:40:13 +02:00
LemADEC
ebd2f81ac6
Merge branch 'Cr0s-master2'
2014-08-27 16:30:22 +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
LemADEC
060b907b44
Reactor fix at chunloading
...
Updated Reactor script to restore its parameters at boot
Updated Reactor script to support warpcore (partial)
2014-08-27 15:34:57 +02:00
Cr0s
97df0feb29
Fixed regression that broke IC2 reactors and some machines
...
IC2 reactors was fixed in 86e96a43ee
2014-08-27 16:53:59 +04:00
LemADEC
da93b5c2b2
Reactor recipe fix
2014-08-26 22:10:51 +02:00
LemADEC
72ed352b89
Code cleanup
2014-08-26 22:10:39 +02:00
LemADEC
84546c2984
Reactor monitor handling
...
Integrated default LUA script for monitor handling
2014-08-25 03:13:44 +02:00
LemADEC
29a16fc42d
One less dup bug
...
Fixing a dup bug in the mining laser introduced with the merge
Code cleanup
2014-08-25 03:12:43 +02:00
LemADEC
1290e6f61b
Workaround for coil state
...
Added quick & dirty workaround for cloaking coil not showing as enabled
when resizing field
2014-08-23 17:54:32 +02:00
LemADEC
e7f08e09b1
Mining laser balance pass
...
Adjusted mining laser default costs in relation to Buildcraft's quarry
2014-08-23 17:07:33 +02:00
LemADEC
8b97caf650
Adding monitor & redstone support
2014-08-23 15:32:45 +02:00
LemADEC
315853551e
Missing reactor script
...
Added missing reactor startup script
Added updater in other supported blocks
2014-08-23 15:10:53 +02:00
LemADEC
9712ff88b0
Merge branch 'master' of https://github.com/YuRaNnNzZZ/WarpDrive
...
Conflicts:
src/cr0s/WarpDrive/SpaceEventHandler.java
src/cr0s/WarpDrive/WarpDrive.java
src/cr0s/WarpDrive/machines/TileEntityProtocol.java
src/cr0s/WarpDrive/world/SpaceWorldGenerator.java
2014-08-23 15:04:02 +02:00
LemADEC
1d5e56478e
Refactoring configuration, optional LUA scripts
...
Refactored configuration categories
Fixed duplicated default configuration values
Added configuration to adjust LUA scripts preloaded
Removed dead code
Added a couple missing configuration (laser lift notably)
2014-08-23 14:20:27 +02:00
LemADEC
0b9d2a7cb9
Version bump
2014-08-23 13:22:13 +02:00
LemADEC
781388a59c
Missing transportBeacon texture & recipe
2014-08-23 13:17:19 +02:00
LemADEC
1c3f8c7807
Bug fixes & core version bump
...
Bumped core version due to interfaces changes
Fixed cloaking lua script due to cleanup (frequency isn't needed)
Fixed radar ping script (it would never find anything)
Improved radar scripts to accept any radar connection
Fixed laser lift pushing down entities already on the ground
Fixed laser lift laser effect
2014-08-23 13:04:29 +02:00
LemADEC
c908bd03f5
Items aren't blocks...
2014-08-23 12:57:16 +02:00
LemADEC
c290a7da9c
Cleanup
2014-08-23 12:29:51 +02:00
LemADEC
93a3c8087e
Adding laserSend event
...
Adding a 'laserSend' event to the laser
2014-08-23 12:29:35 +02:00
LemADEC
2a88825542
Updated registries to static (?)
2014-08-23 12:28:48 +02:00
LemADEC
4284984439
Merging DarkholmeTenk & cleanup
...
Updating chunkloader block
Addind decorative block
Updated registries to static (?)
Reverted interfaces back in main mod
Updated formating in TileEntityParticleBooster
Renamed BlockBeacon to BlockTransportBeacon for consistency
2014-08-23 12:27:38 +02:00
YuRaNnNzZZ
ce695c5fe9
oops
2014-08-20 16:33:35 +04:00
YuRaNnNzZZ
eacfcb9a25
Added redstone block to ores list
2014-08-20 16:23:24 +04:00
LemADEC
a95a739976
TransitionPlanes & fixes
...
Added proper worldborder & transition planes configuration
Warning: only first transition plane is taken into account for now
Fixed reactor explosion radius asymetry
Improved reactor laser/explosion formulas & logs readability
Fixed air generator breathing shifted one block below
Fixed world border checking only positive coordinates
Updated reactor recipe for TDK packs
2014-08-20 03:05:25 +02:00
YuRaNnNzZZ
3935143177
Merge pull request #1 from LemADEC/master
...
Removing a few hacks, reactor fixes
2014-08-19 16:59:14 +04:00
