Commit Graph
292 Commits
Author SHA1 Message Date
tterrag1098 4cfcc874dc The great format and clean up. IMPORTANT: Read below.
All devs and contributors should use the provided formatter settings. 
If your IDE does not support the format, the rules are simple, it is the
default java formatting rules, with 200char line lengths and 1 extra
line after class definitions.
2015-01-07 19:50:18 -05:00
tterrag1098 906c730a3c Add formatting rules 2015-01-07 19:47:07 -05:00
tterrag1098 bfe82e5c52 No more diamond chisel class 2015-01-07 19:45:41 -05:00
tterrag1098 76f3893db8 Fix left-click chiseling.
Remove chisel harvest levels. 
Both chisels in 1 ID
2015-01-07 19:43:45 -05:00
Cricket becc3dec9b Removed un-needed blocks 2015-01-07 19:00:12 -05:00
Cricket 6db3cb98fd Merge pull request #105 from Adaptivity/UpdateruRUlang
Update ru_RU.lang
2015-01-07 04:15:10 -08:00
Adaptivity 19fecd2561 Update ru_RU.lang 2015-01-07 15:07:55 +03:00
CptSpaceToaster 8423389738 partial CTM lighting fix 2015-01-07 00:46:35 -05:00
Cricket 3298bf0e1c renamed 2015-01-06 21:11:57 -05:00
Cricket 4d205f3b37 Crafing and removed debug block 2015-01-06 20:47:11 -05:00
Cricket f8b87c8539 Projected changelog and version bump 2015-01-06 20:38:54 -05:00
Cricket 66fcf44d7a Fixed durability, and removed my stuff 2015-01-06 20:34:41 -05:00
Cricket ef506e57a9 Chisel left click redone, Thanks tterrag 2015-01-06 20:29:22 -05:00
Drullkus fb04896669 No, BRAAAINZ.
Keep it >:(
2015-01-06 10:36:04 -08:00
Arona Jones 0f895f64ff Even more lang changes 2015-01-06 18:11:13 +00:00
Arona Jones fabbdeb57f Another mispelling 2015-01-06 18:08:33 +00:00
Arona Jones 89f5d7255e Someone can't spell 2015-01-06 18:06:45 +00:00
Arona Jones 620c9e10ec Merge pull request #102 from Adaptivity/Localization
Update ru_RU.lang
2015-01-06 18:01:34 +00:00
Adaptivity 51050799a7 Update ru_RU.lang 2015-01-06 20:18:27 +03:00
Drullkus 6f68033355 Adding three fixed CTM files.
They're close enough I guess. I'll tweak them later.
2015-01-05 21:00:37 -08:00
Cricket 9ea8a3bf1f Fixed it and my horrible derp 👯 2015-01-05 20:57:32 -05:00
Cricket e9908e60d0 Merge remote-tracking branch 'origin/master' 2015-01-05 20:25:30 -05:00
Cricket 50937c3e41 add textures, I can't get this to work for the life of me 2015-01-05 20:25:16 -05:00
Drullkus cd0efbc101 Fix it up a little 2015-01-05 17:07:36 -08:00
Drullkus 5f99b625a1 Commit stuff for MCBugtracker. 2015-01-05 16:44:55 -08:00
Cricket ec2313dcb2 and... imports 2015-01-05 19:15:35 -05:00
Cricket 86f17703b5 Create GeneratorChisel.java 2015-01-05 19:14:54 -05:00
Cricket 75adbfe1d1 textures 2015-01-05 19:14:13 -05:00
Cricket bcc5db17d0 Merge remote-tracking branch 'origin/master' 2015-01-05 18:18:07 -05:00
Cricket 48a66e6e9e 1.8 generation added, fixed #91 and #84 2015-01-05 18:17:57 -05:00
Drullkus 53ec662a0c Setup Textures for AntiBlocks and retextured Hex Plating 2015-01-04 18:39:27 -08:00
Arona Jones 7be5379b59 Coloured Sand, as requested. Closes #83 2015-01-04 18:19:38 +00:00
Arona Jones 3522e281d7 .gitignore server stuff and update forge version 2015-01-04 18:14:38 +00:00
Cricket b32f897477 I think this will fix it? 2015-01-04 10:03:44 -05:00
Cricket 9cdd875e1d Merge remote-tracking branch 'origin/master' 2015-01-03 21:26:04 -05:00
Cricket 85a08c3bc5 Cryogenic sign, eh its ok 2015-01-03 21:25:52 -05:00
Cricket fc5e46d144 Merge pull request #87 from Voidi/master
support Chisel Input with registered ores and oreDictonary
2015-01-03 17:51:34 -08:00
CptSpaceToaster fd908283f0 merged in changes from OCD blocks 2015-01-03 17:32:33 -05:00
Cricket c59af3601e Forgot crafting recipes 2015-01-03 16:50:54 -05:00
Cricket 7a2e3fc094 Pumpkin is brighter now, found it a little dim 2015-01-03 16:44:37 -05:00
Meadowcottage 0a10e8391f Added OCD Blocks 2015-01-03 14:24:51 +00:00
Cricket 6c7f569d4d Added AlchemicalWizardry support 2015-01-02 21:22:46 -05:00
Cricket b06bdc936b oops 2015-01-02 18:53:43 -05:00
Cricket c25879ddbc Tab organization 2015-01-02 18:52:53 -05:00
Cricket 64349f88a4 EnderIO compat hopefully fixes #9 2015-01-02 17:26:12 -05:00
Cricket 1e5397ac17 Merge remote-tracking branch 'origin/master' 2015-01-02 16:47:08 -05:00
Cricket 996be4b4e0 Diamond chisel is working 2015-01-02 16:46:57 -05:00
Arona Jones 4cb1d4c50e Fix Hex plating only giving 1 block, instead of 8 2015-01-02 19:18:15 +00:00
Cricket b2a8807efd Merge branch 'Meadowcottage-master' 2015-01-02 11:45:25 -05:00
Cricket 7c9c7b1794 Initial diamond chisel update 2015-01-02 11:45:04 -05:00