Commit graph

598 commits

Author SHA1 Message Date
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
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
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
Francesco Macagno
1429476bff Merge branch 'MC1.7-Merge' into ConfImprovements 2015-08-14 16:20:47 -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
LemADEC
b83a14752a Updated internal classes and assets for blocks (pass 1) 2015-08-13 22:43:31 +02:00
Francescco Macagno
1f0c0dfa49 updates to reflect runtime dependency changes 2015-08-13 13:00:26 -07:00
Francesco Macagno
482f9c86ae Added OreManager to manage generic ore generation 2015-08-11 23:24:48 -07:00
Francesco Macagno
25573500e7 Add planetoid to represent planets 2015-08-11 20:19:16 -07:00
LemADEC
72628900f3 Merge branch 'MC1.7' of https://github.com/LemADEC/WarpDrive into MC1.7 2015-08-12 02:30:16 +02:00
LemADEC
7beed32610 Fixed crossmod compatibility (#39) 2015-08-12 02:30:06 +02:00
Francesco Macagno
c5e38ee9be Added experimental planet definitions 2015-08-10 23:49:54 -07:00
Francesco Macagno
ce3b90c4be Changed Sun to Star 2015-08-10 23:24:24 -07:00
Francesco Macagno
7bf5d55d04 Merge branch 'MC1.7' into ConfImprovements 2015-08-10 23:13:34 -07:00
Francesco Macagno
2ed66dadda Merge branch 'ConfImprovements' into MC1.7
Conflicts:
	src/main/java/cr0s/warpdrive/WarpDrive.java
	src/main/java/cr0s/warpdrive/conf/WarpDriveConfig.java
2015-08-10 23:12:45 -07:00
Francescco Macagno
238b6b02fe Only upload java 7 version 2015-08-10 20:33:46 -07:00
Francescco Macagno
d28b274edf Plurals are evil 2015-08-10 20:25:28 -07:00
Francescco Macagno
d9e84d7224 Update .travis.yml 2015-08-10 20:21:05 -07:00
Francescco Macagno
93bd8b2761 Update .travis.yml 2015-08-10 19:37:44 -07:00
Francescco Macagno
d02eaa94ae Update README.md 2015-08-10 19:33:53 -07:00
Francescco Macagno
a866b6bd46 Missed a piece 2015-08-10 19:31:19 -07:00
Francesco Macagno
55614b1a6c Trying to fix travis 2015-08-10 19:29:27 -07:00
LemADEC
c059622fd9 Fixed mining laser not filling chests 2015-08-11 03:27:49 +02:00