Commit graph

339 commits

Author SHA1 Message Date
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
LemADEC
4f8a54fe75 Removing a few hacks, reactor fixes
Removed hack in gravity handling
Cleaned up reactor code (constructor, etc.)
Fixed bad reactor maths
Fixed reactor spam effect
Removed reactor logs
2014-08-19 03:29:44 +02:00
YuRaNnNzZZ
15dd0ed4ff Finally removing worldborder 2014-08-18 20:35:20 +04:00
YuRaNnNzZZ
19fb1f0734 mcwarpupdater lua 2014-08-17 18:29:47 +04:00
YuRaNnNzZZ
f2a3f19bf1 mcwarpupdater lua 2014-08-17 18:27:47 +04:00
YuRaNnNzZZ
88dff16aef some patches 2014-08-17 18:16:26 +04:00
LemADEC
a161701abd Reactor balance pass with logs
Removed the "laser spam" double penalty
Fixed a few regression from the IC2 update
Added spamming logs to check the laser spam
2014-08-17 11:37:19 +02:00
LemADEC
bf65eda81e Added infos on power store block 2014-08-17 11:35:01 +02:00
LemADEC
ae82ba885f Let's keep it simple :) 2014-08-17 11:34:35 +02:00
LemADEC
e3e850848a Works better with textures... 2014-08-16 18:52:10 +02:00
LemADEC
b22b49fa9c Jump debuging logs 2014-08-16 18:17:10 +02:00
LemADEC
b7e739ff43 Reactor stats fix
Fixing IC2 power output not updating stats
2014-08-16 18:16:15 +02:00
LemADEC
566e71c288 Restructuration
Reorganised file structure
Code cleanup (ComputerCraft methods, dead variables, etc.)
2014-08-16 18:14:59 +02:00
LemADEC
1e05dc711a Merging air canister & fixing laser lift 2014-08-16 18:07:54 +02:00
LemADEC
3e12e537e3 Merging PowerStore & ItemUpgrade 2014-08-15 13:33:08 +02:00
LemADEC
512a38f629 Oups...
Missings from previous commit
2014-08-15 13:32:34 +02:00
LemADEC
51a4b6e099 Energy handling refactorization & some merging...
Reimplemented energyHandling from CoFH & IC2 reference designs
Added IC2 energy output support
Merged p1rx shipscanner energy handling
Merged DarlholmeTenk BlockContainer & new interfaces
Bumped WarpCore version
2014-08-15 13:31:24 +02:00
LemADEC
33e4e2a478 IC2 fixes & forgeMultipart support
Fixed a regression in handling IC2 tile entities
Added support for ForgeMultipart
Improved logs when exception was raised during jump phase
2014-08-15 02:41:17 +02:00
LemADEC
d149c44a7e Non-debug logs initial factorisation
Added global log print function
2014-08-15 02:40:01 +02:00
LemADEC
75a8fc915e Reactor laser fix
Fixed reactor stabilising with only 1 EU per second
2014-08-15 02:38:39 +02:00
Cr0s
597d216e33 Merge pull request #39 from p1rx/patch-1
Fixed scanning of GregTech machines with ShipScanner.
2014-08-13 20:52:26 +04:00
p1rx
e6ea013df4 Исправление сканирования грегомашин шипсканером. 2014-08-13 07:21:02 +04:00
LemADEC
f2921db45c Small optimisations to Camera registry, etc.
Updated monitor to only work with an empty hand
Removed useless calls to invalidate (Forge already do it)
Fixed Camera & LaserCamera not always removed from registry
Improved server & network load when updating Camera & LaserCamera
registration
Updated debug logs to state client/server side
2014-08-10 16:47:26 +02:00
LemADEC
147f4f4ebc Fixed memory leak & chunk (re)loading
Fixed camera registry reloading unloaded chunks
Fixed camera registry adding existing cameras
Refactored camera registry update
Fixed camera registry dead lock in debug environment
2014-08-10 16:26:00 +02:00
LemADEC
f74b3a7f67 Fix potential world corruption
Fixed Air generator handling of metadata to avoid world corruption
Removed unnecessary access to chunk data when updating textures
2014-08-10 16:21:11 +02:00
LemADEC
274d4964a7 Fixed comment on CoFH API source 2014-08-10 12:39:02 +02:00
LemADEC
b39b55c651 Merge pull request #4 from LemADEC/Cr0s-master
Added API for reference purpose
2014-08-09 12:40:04 +02:00
LemADEC
c2f8af5c2e Added API for reference purpose
Nota: CoFH API is no longer available on GitHUB for 1.6.4.
2014-08-09 12:11:21 +02:00
Cr0s
a26362de77 Merge pull request #38 from drpepper240/master
getFirstHit fix
2014-08-08 23:20:49 +04:00
drPepper
9657300764 getFirstHit fix 2014-08-08 20:52:26 +04:00
drPepper
c22c75cd1e Merge branch 'lasers' 2014-08-08 20:51:23 +04:00
drPepper
748d7e08b1 getFirstHit fix 2014-08-08 20:50:15 +04:00
drPepper
2204e7c139 Merge pull request #1 from ZLOFENIX/master
latest
2014-08-08 20:33:05 +04:00
Cr0s
68ae3bd965 Merge pull request #37 from Cr0s/revert-36-master
Revert "Merging DarkholmeTenk & my branches back to main"
2014-08-08 15:30:50 +04:00
Cr0s
f02ca71a70 Revert "Merging DarkholmeTenk & my branches back to main" 2014-08-08 15:29:16 +04:00
Cr0s
0a30aa3858 Merge pull request #36 from LemADEC/master
Merging DarkholmeTenk & LemADEC to Cr0s/WarpDrive/master
2014-08-08 15:04:36 +04:00
LemADEC
a2ce74e228 Merge pull request #3 from LemADEC/Cr0s-master
Merge the merge, back on master
2014-08-07 11:37:12 +02:00