Commit Graph
1749 Commits
Author SHA1 Message Date
Sunstrike 891086dca4 Port TCon to use the v2 loader infrastructure from Mantle 2014-04-20 12:31:18 +01:00
Sunstrike a3aa7c2380 Bump Mantle version to dev-131.
Receive v2 loader update.
2014-04-20 12:12:43 +01:00
Progwml6 24f682c6c9 add AT for diyo 2014-04-19 19:15:56 -04:00
mDiyo e1e546a594 Merge pull request #611 from konals/master
Fixed bug with Casting Channel rendering (For real)
2014-04-18 23:30:00 -07:00
konals 382d343a01 Revert 2014-04-19 01:25:11 -05:00
konals 4f4363ac0c Bizarre fix to weird rendering bug in Casting Channels 2014-04-19 00:58:56 -05:00
konals d8370ef39e Adding non-opaqueness to Casting Channels 2014-04-18 22:01:53 -05:00
Zach ea3dcc4048 Merge pull request #604 from Mexahoid/patch-2
Update ru_RU.lang
2014-04-18 20:12:26 -04:00
Zach 16eab84219 Merge pull request #607 from Zerokyuuni/master
Add enderblock to oredict for 1.7.2
2014-04-18 20:11:53 -04:00
Zerokyuuni b1d045c018 Add enderblock to oredict for 1.7.2 2014-04-18 19:45:59 -04:00
Alexander dbb3095433 Fixing Exoarmor with crafting crashing you 2014-04-18 11:24:42 -04:00
Mexahoid 808ed14fe8 Update ru_RU.lang 2014-04-18 18:04:47 +04:00
Zach 44679e29a4 change config value to default from feature branch 2014-04-18 00:59:36 -04:00
Alexander 89ee0077be Add some changes 2014-04-18 00:49:00 -04:00
mDiyo da42896f1d Merge pull request #600 from Vexatos/patch-8
Oops.
2014-04-17 00:46:42 -07:00
Vexatos 17ba3cd736 Oops. 2014-04-17 09:46:10 +02:00
mDiyo e6ac9ffdaf Merge pull request #595 from TheVikingWarrior/patch-3
Update it_IT.lang
2014-04-17 00:43:02 -07:00
mDiyo 31fcaaf53e Merge pull request #597 from Vexatos/patch-5
Update de_DE.lang
2014-04-17 00:42:27 -07:00
Vexatos f2203aa50e Update de_DE.lang 2014-04-17 09:34:18 +02:00
TheVikingWarrior d3743b9931 Update en_US.lang 2014-04-17 09:21:10 +02:00
TheVikingWarrior e6aed3d1c7 Update it_IT.lang 2014-04-17 09:19:02 +02:00
Progwml6 222bcc894e clean up some issues with missed quotes in PR 2014-04-17 01:03:24 -04:00
Zach 9e1a1b3535 Merge pull request #592 from TheVikingWarrior/patch-2
More localization
2014-04-17 00:34:31 -04:00
TheVikingWarrior 2a844fa362 Merge pull request #7 from TheVikingWarrior/patch-1
Localizations
2014-04-16 19:02:16 +02:00
TheVikingWarrior af3f6078b6 Update it_IT.lang 2014-04-16 19:00:18 +02:00
TheVikingWarrior 263dd2cb7a Update en_US.lang 2014-04-16 18:54:58 +02:00
TheVikingWarrior 19cbd3bffb Update TContent.java 2014-04-16 18:38:42 +02:00
TheVikingWarrior 60ceb034d3 Update TRecipes.java 2014-04-16 18:25:32 +02:00
TheVikingWarrior 41679e4515 Update SmelteryGui.java 2014-04-16 18:02:27 +02:00
TheVikingWarrior a8b13ecb40 Random streamer localization 2014-04-16 17:56:42 +02:00
TheVikingWarrior 53e2c5aadf Thaumic tool trait 2014-04-16 17:51:59 +02:00
TheVikingWarrior 857b6c8997 Update TContent.java 2014-04-16 17:49:56 +02:00
TheVikingWarrior 0e4cbfc3b8 Update TContent.java 2014-04-16 17:49:18 +02:00
TheVikingWarrior 0263c6de0e Update TRecipes.java 2014-04-16 17:36:23 +02:00
TheVikingWarrior 4b40a08d2e Update ModSmite.java 2014-04-16 17:10:35 +02:00
TheVikingWarrior 8b296e06ba Update ModReinforced.java 2014-04-16 16:54:47 +02:00
TheVikingWarrior 5e4d1d0ebe Update en_US.lang 2014-04-16 16:47:33 +02:00
TheVikingWarrior cc414faf1d Update ModRedstone.java 2014-04-16 16:12:10 +02:00
TheVikingWarrior e9d602aa4d Update ModRedstone.java 2014-04-16 16:09:06 +02:00
TheVikingWarrior cd2599d816 Update ModPiston.java 2014-04-16 15:59:53 +02:00
TheVikingWarrior 7aa23ac405 Update ModBlaze.java 2014-04-16 15:55:41 +02:00
TheVikingWarrior 770af463ef Update ModLapis.java 2014-04-16 15:55:24 +02:00
TheVikingWarrior d2011475fb Update ModFlux.java 2014-04-16 15:49:41 +02:00
TheVikingWarrior a14f47ebe0 Update ModButtertouch.java 2014-04-16 15:47:22 +02:00
TheVikingWarrior e3bc06e5fa Update ModBlaze.java 2014-04-16 15:44:24 +02:00
TheVikingWarrior 04a854ac34 Update ModBlaze.java 2014-04-16 15:15:51 +02:00
TheVikingWarrior 01fe4b708c Update ModAttack.java 2014-04-16 15:13:59 +02:00
TheVikingWarrior a1bf308a6e Update ModAntiSpider.java 2014-04-16 15:11:24 +02:00
Progwml6 ccdeeaa537 restore FMP integration minus connected textures (still WIP) 2014-04-16 04:46:22 -04:00
TheVikingWarrior a1bdf9f172 Update AModDoubleJump.java 2014-04-15 22:16:47 +02:00