tterrag1098
007552b812
Merge pull request #2114 from HenryLoenwind/baubles
...
More Baubles support
2015-03-29 01:29:00 -04:00
WLCD
c4044f4b21
Added missing translations (part2)
...
Additional translations done and/or added
2015-03-27 13:56:49 +01:00
WLCD
208979c09f
Added missing translation + minor corrections
...
- Added the missing item/conduits/machine/blocks/powders/etc...
- Corrected some mis-translations
- This is still a work in progress, I'll address the rest in a next update as soon as I can
2015-03-26 13:56:15 +01:00
tterrag1098
c757f51069
Turns out Gson allows comments, who knew?
2015-03-25 22:31:37 -04:00
HenryLoenwind
c9a7aab066
ingotAluminuim? ingotAluminium? ingotAluminum? What a mess...
...
re #2148
2015-03-22 16:37:39 +01:00
tterrag1098
e024666a4f
Merge all telepad models into one, add (very very basic) animation
2015-03-21 04:04:41 -04:00
tterrag1098
8605d02f3e
Partially implement telepad model
2015-03-20 00:09:39 -04:00
Henry Loenwind
139544af3e
Added bone meal support to farming station
...
* 2 new slots for bone meal
* Will try to use it on everything thats on the field and cannot be
harvested
* Different RF usage for successful and unsuccessfull tries
* Fix: Output slots no longer accept seeds
* Fix: "Only one tool per slot" policy works again
2015-03-20 03:16:23 +01:00
tterrag1098
39b871dd17
Merge pull request #2101 from HenryLoenwind/shearFarmer
...
Add more output slots to farming station
2015-03-19 22:08:42 -04:00
HenryLoenwind
374b37a15e
KeyBinding for the Magnet
...
* default binding is "none"
2015-03-20 01:08:09 +01:00
tterrag1098
a7656eb8ce
The great block texture update! Retexture almost every block.
2015-03-19 17:04:04 -04:00
tterrag1098
0c29f61347
Move still used textures out of old folder
2015-03-19 10:17:10 -04:00
HenryLoenwind
e8feb577b7
More Baubles support
...
* Wireless Charger charges Baubles items
* Fix: No more log spam without Baubles installed
* EIO Magnet now can be worn as amulet (Magnet must be enabled first)
2015-03-19 10:48:30 +01:00
HenryLoenwind
d7a3b347b8
Added output slots to farming station
...
* Added 2 output slots to farming station to prevent overflow from
shearing leaves
* Resized GUI to make space
* Solves #2096
2015-03-18 21:58:16 +01:00
tterrag1098
31f193be2c
Move overlay textures into their own folder, fix model machine overlays
2015-03-18 14:48:36 -04:00
tterrag1098
c989340b02
Implement combustion gen model and add system for rotatable ISBRH models
2015-03-17 03:23:59 -04:00
tterrag1098
fca2a2fbfc
Further implement techne model rendering. Implement farm model.
2015-03-16 23:46:51 -04:00
tterrag1098
9e135a9e2b
#2090 Add default oredict preference for nether quartz dust
2015-03-15 23:23:43 -04:00
tterrag1098
0f1d4399f9
New photovoltaic textures
2015-03-15 22:29:30 -04:00
tterrag1098
29c60f1d75
Merge branch 'master' into Telepad
2015-03-15 04:28:33 -04:00
tterrag1098
42c99bbdae
Add interdimensional travel to telepad. Some improvements to text fields
2015-03-15 04:28:22 -04:00
tterrag1098
0b98d1f3ff
Remove use of itemID from XML comments
2015-03-15 02:28:39 -04:00
tterrag1098
350860fb2c
Merge branch 'master' into Telepad
2015-03-14 21:22:04 -04:00
tterrag1098
36381fd28a
Revised facade, armor item/model, and The Ender textures
2015-03-14 00:57:40 -04:00
tterrag1098
542f761769
Add "Sunlight Blocked!" to WAILA for solar panels if they cannot see sky
2015-03-05 15:36:32 -05:00
tterrag1098
3f9993289c
Merge pull request #1877 from HenryLoenwind/shearFarmer
...
Farming station can utilize shears
2015-03-01 08:49:12 -05:00
tterrag1098
d5abaa8003
Improve active sound, add teleport sound, fix sync issues
2015-02-28 14:45:20 -05:00
tterrag1098
96273cede4
Merge remote-tracking branch 'origin/master' into Telepad
...
Conflicts:
src/main/java/crazypants/enderio/EnderIO.java
src/main/java/crazypants/enderio/enderface/BlockEnderIO.java
src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java
src/main/java/crazypants/enderio/teleport/TravelEntitySpecialRenderer.java
src/main/java/crazypants/gui/GuiContainerBase.java
src/main/java/crazypants/gui/IGuiScreen.java
2015-02-26 11:33:42 -05:00
Matthias Mann
0287384dd0
track capbank input and output separately - display both on higher than wide info panels
2015-02-23 22:09:48 +01:00
tterrag1098
50484ea983
Remove emasher's recipes
2015-02-23 12:35:11 -05:00
tterrag1098
42ba9d7ce3
Dang it eclipse...forgot a few
2015-02-23 06:54:16 -05:00
tterrag1098
2ad37c1990
Fix missing conduit textures
2015-02-23 06:52:47 -05:00
HenryLoenwind
a79ae8b0d3
Farming station can utilize shears
...
* Farming stations will use shears if available and there are enough
sapling in store
* Otherwise they will break the leaves with the axe
* Third tool slot was added for the shears
* Old inventories will be adapted automagically
* GUI texture is still missing
Added GUI texture
* GUI texture with third slot for shears
* Fixed slot positioning
Fixed transparency
2015-02-23 09:52:30 +01:00
tterrag1098
b82e642d1e
Merge pull request #1948 from MatthiasMann/conduit_waila
...
only transmit required information for conduits, add used channels display for ME conduits
2015-02-21 18:26:13 -05:00
tterrag1098
bf0bf98c21
Add a teleport active sound, fix Lang
2015-02-18 01:23:03 -05:00
Matthias Mann
46f75ff5c1
only transmit required information for conduits, add used channels display for ME conduits
2015-02-17 14:30:33 +01:00
tterrag1098
0c105c7c78
Lots of telepad function/GUI work, add some rudimentary rendering
2015-02-16 00:11:52 -05:00
Matthias Mann
c91860bc6b
save locked slots state when picking up a Farming Station, cleanup GUI code and locked state handling
2015-02-14 13:00:42 +01:00
tterrag1098
2cb28a72eb
Telepad now actually teleports, additional GUI/other refinements
2015-02-14 02:34:08 -05:00
Adaptivity
2449260618
Update ru_RU.lang
2015-02-14 10:01:04 +03:00
tterrag1098
de55e3336c
Merge remote-tracking branch 'origin/master' into Telepad
...
Conflicts:
src/main/java/crazypants/gui/GuiContainerBase.java
2015-02-14 00:41:37 -05:00
tterrag1098
0f47c44d55
Merge pull request #1920 from Neodark7/master
...
Added Biomes O' Plenty ores recipes in SAGMill
2015-02-14 00:07:24 -05:00
neodark7
0a7a91baec
Fixed BoP ores integration again
2015-02-14 06:05:17 +01:00
tterrag1098
2e74bbd5e6
Add new coord selector textures and rename to fit more appropriately
2015-02-13 23:21:41 -05:00
tterrag1098
95d123a132
Redo how the coords card works, finish it off, except for texture
2015-02-13 22:44:33 -05:00
tterrag1098
007c24377e
Add Coords Card
2015-02-13 19:20:14 -05:00
tterrag1098
cb311e1b4d
Merge pull request #1862 from HenryLoenwind/newTooltips
...
Added Tooltips for item conduit upgrade slots
2015-02-13 16:20:00 -05:00
tterrag1098
95f016ee92
Merge pull request #1907 from MatthiasMann/generator_progress_tooltips
...
add remaining percentage/time/RF tooltip on stirling generator
2015-02-13 16:18:54 -05:00
tterrag1098
c355defbc8
Merge pull request #1916 from Adaptivity/additlocalization
...
Localized few tooltips
2015-02-13 16:18:14 -05:00
Adaptivity
50548cae19
Localized few tooltips
2015-02-13 22:19:32 +03:00