Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
988 commits 8 branches 38 tags 420 MiB
Commit graph

394 commits

Author SHA1 Message Date
LemADEC
e69dbd1f5b Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7 2015-08-30 02:08:26 +02:00
LemADEC
c2d2746868 Fixed a couple cloaking crashes 2015-08-30 02:08:16 +02:00
Francesco Macagno
007a8d12ef Added method for preprocessing 2015-08-29 13:14:26 -07:00
Francesco Macagno
c16408b282 Added prototype asteroid generation 2015-08-29 13:14:11 -07:00
Francesco Macagno
6a0f81fb64 Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7 2015-08-29 13:13:56 -07:00
Francesco Macagno
d5e511ac84 Fixed NPE 2015-08-29 13:13:52 -07:00
LemADEC
39937f1267 Fixed log spam 2015-08-29 21:14:11 +02:00
LemADEC
33577951d5 Fixed a train of cloaking issue 
Fixed cloaking support on dedicated server
Fixed uncloaking with negative X or Z
Fixed cloak causing memory leak over time on client side
Fixed ghost cloaks when changing world or save
Refactored packet handler vs cloaked area
Improved general speed and memory consumption
 2015-08-29 21:11:49 +02:00
LemADEC
81975d9063 Replaced stdout with a proper logger 2015-08-29 20:47:21 +02:00
LemADEC
eb7a83223a Fixed space command sender name 2015-08-29 19:43:19 +02:00
LemADEC
66d5b6e49b Oups... 2015-08-29 15:03:25 +02:00
LemADEC
5aecdc08d2 Fixed various teleportation issues 
Added support to any dimension in /space command
Fixed player falling to their death /space command
Fixed flying players loosing flight after teleportation
 2015-08-29 15:02:34 +02:00
LemADEC
de7f344eed Fixed another console spam 2015-08-29 14:30:45 +02:00
LemADEC
e8deffdd57 Code cleanup 2015-08-29 14:05:28 +02:00
LemADEC
b27bef87e7 Fixed console spam 2015-08-29 13:58:54 +02:00
LemADEC
1eabee7239 Fixed uncloaking due to air generator 
Improved cloaking on chunkloading
 2015-08-29 13:29:32 +02:00
Francesco Macagno
ff2a72ae28 Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7 2015-08-29 01:56:22 -07:00
Francesco Macagno
4589ad3175 removed filler-ae2.xml from autocopy 2015-08-29 01:56:18 -07:00
Francesco Macagno
a020891528 Fixed obo 2015-08-29 01:55:48 -07:00
Francesco Macagno
fb322b4787 Fixed import error 2015-08-29 01:31:19 -07:00
Francesco Macagno
35b4c280ad Changed asteroid defaults 2015-08-29 01:31:04 -07:00
LemADEC
e5365f8bf1 Various fixes for cloaking and gravity 
Fixed tier 2 cloaking
Fixed cloaking core message
Added cloaking of simple block updates
Fixed crossmod compatibility with ItemPhysic (item gravity)
 2015-08-29 05:03:44 +02:00
LemADEC
821dd21488 Code cleanup 2015-08-29 01:27:41 +02:00
LemADEC
96a8f5b2f2 Fixed cloaking core message 2015-08-28 12:17:01 +02:00
LemADEC
7df39bc6e9 Code cleanup 2015-08-28 12:07:41 +02:00
LemADEC
dfbd452b1a Fixed #82 hardcoded biome id 
Fixed biome registration
Fixed default biome id from 24 to 95
Code cleanup
 2015-08-28 11:33:57 +02:00
Francesco Macagno
97ac427d12 Fixed command asteroid generation 2015-08-27 17:13:53 -07:00
Francescco Macagno
401d63fd53 Fixed shell tags 2015-08-27 08:52:57 -07:00
Francesco Macagno
d3c6c7fb34 Added Asteroid generation 
Still untested prototype, and only generates core
 2015-08-26 23:09:25 -07:00
Francesco Macagno
b06a32b0bf Added debug message to structure loading 2015-08-26 22:53:26 -07:00
Francesco Macagno
be24b75d23 Moved moon definitions 2015-08-26 22:45:50 -07:00
Francesco Macagno
5fa4499e07 Added mod tags 2015-08-26 22:41:12 -07:00
Francesco Macagno
f0a4e0c470 Changed iron_block to iron_ore 2015-08-26 22:28:06 -07:00
Francesco Macagno
87ed479f93 Added ability to invert a mod requirement 
aka mods="!IC2" means ic2 must not be loaded
 2015-08-26 22:28:05 -07:00
LemADEC
1925594177 Code cleanup 2015-08-27 04:19:10 +02:00
Francesco Macagno
aaa621137c Renamed ModReqChecker to XmlPreprocesser 2015-08-26 19:09:37 -07:00
LemADEC
73b1dc41d2 Added preventive fix for cloaking 2015-08-27 03:05:32 +02:00
LemADEC
172d89fcac Fixed #80 crash with block names shorter than 3 characters 
Improved ore dictionnary logs
 2015-08-27 01:51:09 +02:00
LemADEC
94308bc34d Updated default fillers for IC2, ArsMagica2, etc. 
Added an UndergroundBiomes proposal
 2015-08-27 01:04:34 +02:00
LemADEC
122be7494a Code cleanup 2015-08-26 22:19:19 +02:00
LemADEC
d9aca10686 Fixed a few default values in configuration 2015-08-26 21:59:47 +02:00
LemADEC
6affaf2257 Code cleanup 2015-08-26 21:45:11 +02:00
Francescco Macagno
b67378a079 Improved world gen values a bit 2015-08-26 08:56:16 -07:00
LemADEC
cb26f39148 Code cleanup 2015-08-26 11:24:39 +02:00
Francescco Macagno
773b0a3ac2 Update structures-default.xml 2015-08-25 23:54:00 -07:00
Francesco Macagno
3e629554f9 Cleaning 2015-08-25 23:42:18 -07:00
Francesco Macagno
612e5a3036 Misc fixes 2015-08-25 23:42:02 -07:00
Francesco Macagno
4d5aa0fee3 Added getRadius() 2015-08-25 23:41:40 -07:00
Francesco Macagno
9f79af8485 made height, width, and length protected 2015-08-25 22:51:25 -07:00
Francesco Macagno
c16a701d5c Removed defunct radius ccode 2015-08-25 22:50:40 -07:00
Francesco Macagno
d109250a36 Check fillerSet exists 2015-08-25 22:22:22 -07:00
Francesco Macagno
190db24028 Fixed fillerSet seperator 2015-08-25 22:21:58 -07:00
Francesco Macagno
298a40cfd8 Fixed not actually storing moons 2015-08-25 22:21:30 -07:00
Francesco Macagno
6f7a33974e Removed filler-ic2.xml copying 2015-08-25 21:59:41 -07:00
LemADEC
db9263bde4 Fixed jump in space with air generator activated 2015-08-26 03:26:58 +02:00
LemADEC
651d2d7549 Fixed #77 planets not loading properly 2015-08-25 22:59:27 +02:00
Francesco Macagno
427ee28ce4 fixed temporary thickness check 2015-08-24 23:30:19 -07:00
Francesco Macagno
07aafb6207 Added some prototype asteroid gen code 2015-08-24 23:22:51 -07:00
Francesco Macagno
6bdd0ab003 Changed name to group in filllerManager 2015-08-24 23:22:35 -07:00
Francesco Macagno
4d6b8828f3 Removed radius check, not relevant right now 2015-08-24 22:52:31 -07:00
Francesco Macagno
d0b799d552 Miscellaneous xml fixes 2015-08-24 22:52:13 -07:00
Francesco Macagno
f877073ae0 Add empty mod string check 2015-08-24 22:06:28 -07:00
Francesco Macagno
c19c2bc696 changed ae2 mod name 2015-08-24 21:43:21 -07:00
Francesco Macagno
99b165b973 Moved IC2 fillers to default 2015-08-24 20:53:56 -07:00
LemADEC
8799a3b1b9 Fixed default filler for IC2 2015-08-24 23:56:01 +02:00
LemADEC
7a6a17e0bd Fixed minimum distance in ship controller script 2015-08-24 11:01:56 +02:00
LemADEC
2f65b325ec Updated default XML files list 
Renamed conf to config
 2015-08-24 10:32:01 +02:00
LemADEC
154e52cc33 Fixed UTF-8 encoding 2015-08-24 10:30:48 +02:00
LemADEC
dbacf33e81 Fixed jump in space with air generator activated 2015-08-24 03:18:08 +02:00
LemADEC
84806d8561 Fixed dedicated server support 2015-08-24 00:44:03 +02:00
LemADEC
ecfc535b7f Fixed error message in radar's ping script for CC 2015-08-24 00:44:01 +02:00
Francesco Macagno
9c61ec69f2 Updated remaining xml to new format 2015-08-23 15:01:50 -07:00
Francesco Macagno
2a73da0927 Updated netherores FillerSet 2015-08-23 14:54:26 -07:00
Francesco Macagno
c70e1ac6b7 Added corrupted nether moon 2015-08-23 14:54:10 -07:00
Francesco Macagno
b3bd1b7695 Added SchematicStructure to eventually represent schematics 2015-08-23 14:50:35 -07:00
Francesco Macagno
80fedd2ad2 Removed superflous jd tags 2015-08-23 14:49:39 -07:00
Francesco Macagno
5abfa54809 Added import loading to Orb 2015-08-23 14:49:12 -07:00
Francesco Macagno
f22eeaea53 Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7 2015-08-23 14:47:45 -07:00
Francesco Macagno
63380e7d8b Added getFillerSet() 2015-08-23 14:47:42 -07:00
LemADEC
eca46479c9 Fixed controller script crash in teleport menu 2015-08-23 23:41:29 +02:00
Francesco Macagno
aa4602cd6b Updated structures to new format 2015-08-23 14:38:48 -07:00
Francesco Macagno
bf70fe8d25 Changed type to group 2015-08-23 14:38:29 -07:00
Francesco Macagno
a60c9fd5f0 Renamed Ore to filler files 2015-08-23 13:40:01 -07:00
LemADEC
b98092b08a Fixed dedicated server boot 2015-08-23 22:36:38 +02:00
LemADEC
c5244398c7 Code cleanup & Fixed IC2 reactor monitor 
Removed LUA help methods that are in the wiki
Replaced Vector3 with VectorI when applicable
Fixed asynchronous laser beam in Enantiomorphic reactor
Removed redundant code existing in Forge
Fixed default mining laser radius
 2015-08-23 22:08:51 +02:00
LemADEC
c0d5105bd3 Updated configuration for XML and simplification 
Updated configuration structure to match tile names, both internally and
in externally
Moved configuration file to it's dedicated folder
Added copy of default XML files if none was found
Fixed ship scanner max energy stored
Renamed transition planes to planets
Simplified a few configuration entries
Added finer laser cannon effects configuration
Added missing configuration for Cloaking core max energy stored
Added range clamping on all configuration entries
 2015-08-23 19:41:13 +02:00
LemADEC
0c4da0c193 Quick fix for compilation 2015-08-23 15:01:27 +02:00
LemADEC
1f34b4fbcb Fixed configuration loading to be part of PreInit 2015-08-23 14:39:51 +02:00
Francesco Macagno
39759655f7 Updated orb to use new FillerSets 2015-08-23 02:32:12 -07:00
Francesco Macagno
44c6aa4dca Finished new implementation of FillerManager 2015-08-23 02:20:18 -07:00
Francesco Macagno
f9f4a1d8c8 Added new step to structureLoading 2015-08-23 02:19:45 -07:00
Francesco Macagno
a9635d9132 Added ability to import block data 2015-08-23 02:19:13 -07:00
Francesco Macagno
c92e32b96d Added getName to fillerSet 2015-08-23 02:04:33 -07:00
Francesco Macagno
1e742ac68d Improved misc jd 2015-08-23 01:52:31 -07:00
Francesco Macagno
8fafce32ac Added CompareTo and toString 2015-08-23 01:51:48 -07:00
Francesco Macagno
1aa2f3a192 Added more jds to MetaBlock 2015-08-23 00:24:37 -07:00
Francesco Macagno
623d07174b Finished implementation of new FillerSet 2015-08-23 00:21:35 -07:00
Francesco Macagno
76ea0ad6cc Added more javadocs to FillerFactory 2015-08-23 00:21:08 -07:00
Francesco Macagno
60957e1121 Finished initial implementationi of FillerFactory 2015-08-22 22:37:26 -07:00
Francesco Macagno
669b3b5099 Created FillerFactory to load fillers 2015-08-22 22:31:00 -07:00
LemADEC
4f5f1c7f68 Fixed compile issue with wip code 2015-08-23 07:24:04 +02:00
LemADEC
2f2f43e5a5 Code cleanup 2015-08-23 07:18:48 +02:00
LemADEC
0f9967cf06 Upgrade ship core registration to star map 
Fixed ship core registration triggers
Fixed offline ship core invisible on radar
Added starmap initial structure
Improved jumpgate check when ship is fully inside
 2015-08-23 07:18:47 +02:00
LemADEC
9392e724b2 Code cleanup 2015-08-23 07:18:45 +02:00
LemADEC
ad1e138b28 Minor hash optimisation 2015-08-23 07:18:44 +02:00
Francesco Macagno
e8ef384681 Rearranged filler files 2015-08-22 22:08:42 -07:00
Francesco Macagno
c61a12ab22 Made compare include meta 2015-08-22 22:07:42 -07:00
Francesco Macagno
aa6de6177c Added features to MetaBlock 2015-08-22 15:50:41 -07:00
LemADEC
6538fb4929 Fixed reactor chamber crash regression 2015-08-22 14:27:21 +02:00
LemADEC
2d32fe465d Fixed uncloaking of vanilla entities and IC2 blocks 2015-08-22 13:43:18 +02:00
LemADEC
a22d66d3da Fixed cloaking to actually cloak 2015-08-22 13:40:10 +02:00
Francesco Macagno
564d638159 Started implementation of FillerSet 2015-08-20 23:33:59 -07:00
Francesco Macagno
a2df79bc01 Added MetaBlock to store block and metadata 
Must be retrieved with MetaBlock.getMetaBlock(block, meta)
 2015-08-20 23:20:15 -07:00
Francesco Macagno
3dc37dd969 Changed mod checking to occur at start 
any element can now contain an attribute mods which should be a comma
seperated list of mods that are required
 2015-08-20 22:43:35 -07:00
Francesco Macagno
19372a61a6 Added try to prevent crashes during world generation 2015-08-20 22:41:37 -07:00
Francesco Macagno
3e8d774941 Cleaned up Space generator to fit with WDConf 2015-08-20 22:41:10 -07:00
Francesco Macagno
5635441fc7 Removed old world gen block retrieval 
If needed back, revert commit
 2015-08-20 19:36:11 -07:00
LemADEC
0b2375e17f Code cleanup 2015-08-21 01:55:31 +02:00
LemADEC
9788ade634 Fixed IC2 support during jump 
Fixed slow jump on big ships (regression due to 1.7 upgrade)
 2015-08-20 11:50:46 +02:00
Francesco Macagno
1a765d2b34 Cleanup 2015-08-19 21:29:53 -07:00
Francesco Macagno
297a34a060 Changed mod requirements to be more general 2015-08-19 20:28:11 -07:00
LemADEC
c9365b6403 Fixed frequency network packet 2015-08-18 11:09:23 +02:00
Francesco Macagno
62c686c2ef Updated to use new ModReqChecker 2015-08-17 23:06:40 -07:00
Francesco Macagno
834f4f8b95 Changed OreManager to FillerManager 
Also added new categories to match
 2015-08-17 23:06:20 -07:00
Francesco Macagno
bb921c6907 Added generic mod checker 2015-08-17 23:04:22 -07:00
Francesco Macagno
f5821029bf Changed modlist to get text content 2015-08-17 22:49:38 -07:00
Francesco Macagno
c10847db1c Added new example xml files 
None of these will work probably because the names are wrong
 2015-08-17 22:48:48 -07:00
LemADEC
3f48734c05 Fixed #70 IC2 support during jump 
Added workaround hack for IC2 API bug
Fixed IC2 tile entities signature
Fixed debug logging
Code cleanup
 2015-08-18 03:58:58 +02:00
LemADEC
739f98904d Added root element to have valid xml 
Added format version
 2015-08-17 23:58:28 +02:00
LemADEC
e5cad85f0d Merge remote-tracking branch 'origin/MC1.7' into MC1.7 
Conflicts:
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
 2015-08-17 11:46:03 +02:00
LemADEC
311f4cbe4f Added ability to unpack default XML files 2015-08-17 11:30:55 +02:00
LemADEC
736de5f273 Code cleanup 2015-08-17 11:26:43 +02:00
Francesco Macagno
87df1237fb Fix extension 2015-08-16 23:49:37 -07:00
Francesco Macagno
6b261e3c99 Started adding default file copy 2015-08-16 23:45:23 -07:00
Francesco Macagno
bd2155387d Adjusted OrbShell loading to fit LemADEC's modifications 2015-08-16 23:33:28 -07:00
Francesco Macagno
aa6601fee4 added ability to load structures from file 2015-08-16 23:29:22 -07:00
Francesco Macagno
80f05272b2 added default ore file 2015-08-16 23:17:46 -07:00
Francesco Macagno
94684560f6 Add name option to orb 2015-08-16 23:17:33 -07:00
LemADEC
c4e59f26b4 Disabled IC2 rotation support for now 2015-08-17 02:54:39 +02:00
LemADEC
bf2e325db3 Fixed gaz cloud generation crash when none was defined 2015-08-17 02:54:23 +02:00
LemADEC
9ee8220a1a Fixed ComputerCraft integration in world generation 2015-08-17 02:53:46 +02:00
LemADEC
8a7ebb649e Updated XML structure proposal 2015-08-17 01:49:31 +02:00
LemADEC
20fab3a8d9 Fixed #27 
Added configuration for entity IDs
 2015-08-16 23:13:13 +02:00
LemADEC
405ef74516 Fixed #61 ship controller script not booting 2015-08-16 22:48:23 +02:00
LemADEC
6841e99e11 Fixed mouse going to hypersensitivity on disconnection 2015-08-16 22:46:04 +02:00
LemADEC
df590ae2f0 Fixed laser medium peripheral name 2015-08-16 22:44:35 +02:00
LemADEC
f0c85aa421 Code cleanup 2015-08-16 22:44:20 +02:00
LemADEC
132ab7da5c Updated radar scripts 
Added workaround for OC OpenOS bug on background color handling
Fixed title centering
Code cleanup
 2015-08-16 18:24:04 +02:00
LemADEC
cd9b221e99 Fixed Enantiomorphic reactor control script 
Added Mainframe control script
 2015-08-16 17:22:57 +02:00
LemADEC
804a726184 Fixed world generation so it compiles 2015-08-16 16:52:53 +02:00
LemADEC
3f55176d81 Restored old ore generation until XML works 2015-08-16 16:51:17 +02:00
LemADEC
724f7337ee Fixed typo in Enantiomorphic reactor core name 2015-08-16 16:49:46 +02:00
LemADEC
c15e2c9bdf Code cleanup 2015-08-16 16:48:22 +02:00
Francesco Macagno
708fde795f Added basic loading 
Need to create test cases
 2015-08-15 21:44:34 -07:00
Francesco Macagno
700014dad4 renamed to add structures 2015-08-15 21:41:44 -07:00
Francesco Macagno
9fc0d07916 changed default moon type 2015-08-15 21:41:21 -07:00
Francesco Macagno
f09ec0cfaa Merge branch 'ConfImprovements' into MC1.7 
Conflicts:
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
 2015-08-15 21:21:46 -07:00
Francesco Macagno
efd6d273f7 Cleaned up star a bit 2015-08-15 21:18:47 -07:00
Francesco Macagno
9b7d99c408 A little cleaning 2015-08-15 21:18:25 -07:00
Francesco Macagno
1e687cbf4c Started update to use new conf mechanics 2015-08-15 21:18:01 -07:00
Francesco Macagno
9f3c4d61df Added GasCloud 2015-08-15 21:17:30 -07:00
Francesco Macagno
5cf5d26fe1 Added GasCloud 2015-08-15 21:10:18 -07:00
Francesco Macagno
8b2129f4bc Refactored names and finished ore loading 2015-08-15 16:04:49 -07:00
LemADEC
8f14d0eb0e Improved default radar scripts 
Added OpenComputers support
Code cleanup
 2015-08-15 16:43:27 +02:00
LemADEC
3ff8d4fe10 Improved ship controller boot time slightly 
Remaining is up to the players to tweak out :)
 2015-08-15 16:41:41 +02:00
LemADEC
becfbac554 Improved ship controller boot delay 
Down from 3 to 0.6 s with default startup script
This is a pre-requisite for the upcoming mainframe
 2015-08-15 15:36:43 +02:00
LemADEC
1a3e60b53e code cleanup 2015-08-15 15:25:50 +02:00
LemADEC
0be0f272ab Improved jumpgates command 2015-08-15 15:25:36 +02:00
LemADEC
141f5d7efd Fixed camera handling, including #58 
Fixed camera overlay remaining after disconnection
Removed crosshair in camera overlay
Refactored camera handling into its handler class
Fixed event registration sequencing (Init -> PreInit)
Added zoom factor display
Improved overlay scaling
Added a dedicated logging for camera to fix weapon/targetting mixup
 2015-08-15 13:34:04 +02:00
YuRaNnNzZZ
a7fb566416 make air generator more configurable 2015-08-15 11:38:55 +03:00
YuRaNnNzZZ
a1f39a1ea6 remapping for highly advanced machine block 2015-08-15 11:14:55 +03:00
LemADEC
16f7e644ed Refactored zoom handling (1st pass) 
Fixed zoom order and scaling so it's more user-friendly
Fixed zoom movement consistency
etc.
 2015-08-15 04:35:34 +02:00
Francesco Macagno
0660941200 added getXmlDocumentBuilder 2015-08-14 18:50:47 -07:00
Francesco Macagno
4bbdf209a1 Finished orb implementation 2015-08-14 18:49:48 -07:00
LemADEC
18f4861a09 Code cleanup after merge 
Updated to common coding rules
Refactored getModItemStack & isOpenComputersLoaded
 2015-08-15 02:26:09 +02:00
LemADEC
11e67233ca Updated dependencies to latest 2015-08-15 01:44:59 +02:00
Francescco Macagno
3aafef59a6 Merge pull request #57 from LemADEC/MC1.7 
Want to make sure i am working on newest additions
 2015-08-14 16:23:21 -07:00
LemADEC
40282d41dd Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7 2015-08-15 01:20:46 +02:00
LemADEC
daa0dec478 Fixed gravity management 
Works in development environment too
 2015-08-15 01:20:34 +02:00
Francesco Macagno
673752b26c Merge branch 'ConfImprovements' into HEAD 
Conflicts:
	src/main/java/cr0s/warpdrive/WarpDrive.java
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
 2015-08-14 16:18:42 -07:00
LemADEC
c4211a254d Code cleanup 2015-08-15 01:11:26 +02:00
Francesco Macagno
6de4f42bb4 More improvements to orb 2015-08-14 15:59:54 -07:00
Francesco Macagno
3827ba5d60 Added skeleton StrucutreManager 2015-08-14 15:59:32 -07:00
Francescco Macagno
71afe5b86f Merge pull request #56 from YuRaNnNzZZ/MC1.7 
Various additions
 2015-08-14 15:54:52 -07:00
YuRaNnNzZZ
b510f84bbc well if this is what you want 2015-08-15 00:52:06 +03:00
LemADEC
548a471712 Fixed missing textures broken after remapping 2015-08-14 23:24:23 +02:00
YuRaNnNzZZ
1cbcd7b34f fix cc lua updater script 2015-08-14 23:20:01 +03:00
YuRaNnNzZZ
bcc0bf8675 fixed mod checking for recipes 2015-08-14 22:42:30 +03:00
YuRaNnNzZZ
fa090f0d0f finish russian localization 2015-08-14 21:30:12 +03:00
YuRaNnNzZZ
a94afc1931 Added remapping from old ids for existing worlds. 2015-08-14 20:52:20 +03:00
YuRaNnNzZZ
7c57c4b2e3 fix broken hard recipes and migrate hiadv machine to new style 2015-08-14 20:09:13 +03:00
YuRaNnNzZZ
c840e5a60a Merge branch 'MC1.7' into MC1.7fix 
Conflicts:
	src/main/java/cr0s/warpdrive/WarpDrive.java
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
	src/main/java/cr0s/warpdrive/render/ClientCameraUtils.java
	src/main/resources/assets/warpdrive/lang/en_US.lang
 2015-08-14 19:42:04 +03:00
YuRaNnNzZZ
e1fc75efe8 Various fixes, hard ic2 recipes, new stones for worldgen and russian localization. 2015-08-14 19:35:54 +03:00
Francesco Macagno
7d98a42cfa Added all registered ores display 
Test feature, may revert
 2015-08-13 23:14:43 -07:00
LemADEC
0038e457e4 Fixed core so it's actually loading 
Note: it won't work until node map is updated
 2015-08-14 03:58:28 +02:00
LemADEC
2a1fc2ad37 Fixed logs for radar and breathing 2015-08-14 02:48:19 +02:00
LemADEC
63dcfc5f7e Re-added debug logs from comments 2015-08-14 02:09:00 +02:00
LemADEC
399cf8b6a2 Updated debug logs 
Fixed #54
Replaced debug configuration with a logging section for finer adjustment
 2015-08-14 01:51:50 +02:00
LemADEC
2a61625f7d Updated internal names consistency 2015-08-14 00:06:46 +02:00
LemADEC
04613742d4 Updated registration name for blocks and items (pass 2) 
Fixed #39 (no comment)
Fixed #33
 2015-08-13 23:54:01 +02:00